From d973c4f045872450aa5c9b087d71f407dfe53591 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 19 May 2015 18:03:52 -0700 Subject: [PATCH] A peer's advertisement-interval is reset if you change the peer's remote-as --- bgpd/bgpd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.39.5