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>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 824b326e90d66ec43f623ecf85fc59674441b59d..08578d581d31a917167761d2ad05d9fea89f68cf 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -16409,9 +16409,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.  */
@@ -16465,6 +16462,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);