]> git.proxmox.com Git - mirror_frr.git/commit - bgpd/bgp_packet.c
bgpd: fix various problems with hold/keepalive timers
authorDon Slice <dslice@cumulusnetworks.com>
Thu, 19 Oct 2017 18:23:30 +0000 (14:23 -0400)
committerDon Slice <dslice@cumulusnetworks.com>
Thu, 26 Oct 2017 15:55:31 +0000 (11:55 -0400)
commitd25e4efc52eb5e4c71f43c02991e3c9bba2388c1
tree5858964602ed9e9e2e3c2b888b1f0fc0713caddc
parent6d774763d6698bf36b98e2ff26c1f27a492b8cb3
bgpd: fix various problems with hold/keepalive timers

Problem reported that we weren't adjusting the keepalive timer
correctly when we negotiated a lower hold time learned from a
peer.  While working on this, found we didn't do inheritance
correctly at all.  This fix solves the first problem and also
ensures that the timers are configured correctly based on this
priority order - peer defined > peer-group defined > global config.
This fix also displays the timers as "configured" regardless of
which of the three locations above is used.

Ticket: CM-18408
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-6807
Testing-performed:  Manual testing successful, fix tested by
submitter, bgp-smoke completed successfully
bgpd/bgp_fsm.c
bgpd/bgp_packet.c
bgpd/bgp_snmp.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h