summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Walton <dwalton@cumulusnetworks.com>2017-05-16 23:56:31 +0000
committerDaniel Walton <dwalton@cumulusnetworks.com>2017-05-16 23:56:31 +0000
commit10a6a98b0af1c5490c8b87ab0ce15d5edabbbc35 (patch)
tree9d5fcd58071b87b034f0f53adec96f42830e05be
parent464598de53722b515c0967eb223aa538bb27ecf6 (diff)
bgpd: does not honor configured keepalive timer
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--bgpd/bgp_packet.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 796a57f054..5ac982d565 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1118,7 +1118,10 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
else
peer->v_holdtime = send_holdtime;
- peer->v_keepalive = peer->v_holdtime / 3;
+ if (CHECK_FLAG (peer->config, PEER_CONFIG_TIMER))
+ peer->v_keepalive = peer->keepalive;
+ else
+ peer->v_keepalive = peer->v_holdtime / 3;
/* Open option part parse. */
if (optlen != 0)