From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 20 May 2015 01:03:56 +0000 (-0700)
Subject: Always add a keepalive to the OutQ when the KA timer expires
X-Git-Tag: frr-2.0-rc1~1442
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7d1ef6adacd93ee8e131068cca3bd451272086b9;p=mirror%2Ffrr.git

Always add a keepalive to the OutQ when the KA timer expires
---

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 19bd59f5bf..faa171d294 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -395,22 +395,6 @@ bgp_keepalive_timer (struct thread *thread)
   return 0;
 }
 
-static int
-bgp_routeq_empty (struct peer *peer)
-{
-  struct peer_af *paf;
-  int af;
-
-  PEERAF_FOREACH(peer, paf, af)
-    {
-      if (!PAF_SUBGRP(paf))
-	continue;
-      if (!advertise_list_is_empty(PAF_SUBGRP(paf)))
-	return 0;
-    }
-  return 1;
-}
-
 int
 bgp_routeadv_timer (struct thread *thread)
 {
@@ -1333,13 +1317,6 @@ bgp_fsm_open (struct peer *peer)
 static int
 bgp_fsm_keepalive_expire (struct peer *peer)
 {
-  /*
-   * If there are UPDATE messages to send, no need to send keepalive. The
-   * peer will note our progress through the UPDATEs.
-   */
-  if (!bgp_routeq_empty(peer))
-    return 0;
-
   bgp_keepalive_send (peer);
   return 0;
 }