bgpd: Consolidate dampening show run output with the rest of that code

For whatever reason the dampening show run code was outside the normal
loop of code that handles the afi/safi portion.  consolidate it into
the rest of the normal code.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-04-23 14:31:41 -04:00
parent dcc862322c
commit 39d8dd2d17

View File

@ -17234,6 +17234,9 @@ 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. */
@ -17287,15 +17290,6 @@ 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);