From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 20 May 2015 01:03:52 +0000 (-0700)
Subject: A peer's advertisement-interval is reset if you change the peer's remote-as
X-Git-Tag: frr-2.0-rc1~1451
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d973c4f045872450aa5c9b087d71f407dfe53591;p=mirror%2Ffrr.git

A peer's advertisement-interval is reset if you change the peer's remote-as
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index b7e4e1f802..a204e972a6 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1280,7 +1280,10 @@ peer_as_change (struct peer *peer, as_t as)
 
   if (conf && CHECK_FLAG (conf->config, PEER_CONFIG_ROUTEADV))
       peer->v_routeadv = conf->routeadv;
-  else
+
+  /* Only go back to the default advertisement-interval if the user had not
+   * already configured it */
+  else if (!CHECK_FLAG (peer->config, PEER_CONFIG_ROUTEADV))
     if (peer_sort (peer) == BGP_PEER_IBGP)
       peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
     else