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 b7e4e1f802d23cc67aa8f1a711680504b39b2b96..a204e972a6660c7320b3812fa585e87b3df8af65 100644 (file)
--- 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