summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2021-08-02 12:42:56 +0200
committerIgor Ryzhov <iryzhov@nfware.com>2021-08-03 20:54:47 +0200
commit75caa18cefb6c8be6801a1a9f44c13857bc3b684 (patch)
treea586e7d5aaa09da25932ce474d14994640e019e5 /bgpd
parentRevert "doc: user doc for route-flap dampening commands" (diff)
downloadfrr-75caa18cefb6c8be6801a1a9f44c13857bc3b684.tar.xz
frr-75caa18cefb6c8be6801a1a9f44c13857bc3b684.zip
Revert "bgpd: Consolidate dampening show run output with the rest of that code"
This reverts commit 39d8dd2d176e26cff9c62f48048b18cf4df9168a. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_vty.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 2b19f76c7..6c715f040 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -17756,9 +17756,6 @@ static void bgp_config_write_peer_af(struct vty *vty, struct bgp *bgp,
: "");
}
}
-
- if (peer_af_flag_check(peer, afi, safi, PEER_FLAG_CONFIG_DAMPENING))
- bgp_config_write_peer_damp(vty, peer, afi, safi);
}
/* Address family based peer configuration display. */
@@ -17812,6 +17809,15 @@ static void bgp_config_write_family(struct vty *vty, struct bgp *bgp, afi_t afi,
/* BGP flag dampening. */
if (CHECK_FLAG(bgp->af_flags[afi][safi], BGP_CONFIG_DAMPENING))
bgp_config_write_damp(vty, bgp, afi, safi);
+ for (ALL_LIST_ELEMENTS_RO(bgp->group, node, group))
+ if (peer_af_flag_check(group->conf, afi, safi,
+ PEER_FLAG_CONFIG_DAMPENING))
+ bgp_config_write_peer_damp(vty, group->conf, afi, safi);
+ for (ALL_LIST_ELEMENTS_RO(bgp->peer, node, peer))
+ if (CHECK_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE)
+ && peer_af_flag_check(peer, afi, safi,
+ PEER_FLAG_CONFIG_DAMPENING))
+ bgp_config_write_peer_damp(vty, peer, afi, safi);
for (ALL_LIST_ELEMENTS(bgp->group, node, nnode, group))
bgp_config_write_peer_af(vty, bgp, group->conf, afi, safi);