]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: Print dampening configuration per AF, not per neighbor
authorDonatas Abraitis <donatas.abraitis@gmail.com>
Wed, 10 Jun 2020 07:09:01 +0000 (10:09 +0300)
committerDonatas Abraitis <donatas.abraitis@gmail.com>
Wed, 10 Jun 2020 07:23:16 +0000 (10:23 +0300)
This caused duplicate `bgp dampening ...` to be printed per neighbor.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
bgpd/bgp_vty.c

index df82834b512a0f964d2310c083077725d4380a8a..aa5857b9d4436cf96d7a37ce7e5ba7499b0dbeea 100644 (file)
@@ -14815,11 +14815,6 @@ static void bgp_config_write_peer_af(struct vty *vty, struct bgp *bgp,
                vty_out(vty, "\n");
        }
 
-       /* BGP flag dampening. */
-       if (CHECK_FLAG(bgp->af_flags[afi][safi],
-                      BGP_CONFIG_DAMPENING))
-               bgp_config_write_damp(vty, afi, safi);
-
        /* Route reflector client. */
        if (peergroup_af_flag_check(peer, afi, safi,
                                    PEER_FLAG_REFLECTOR_CLIENT)) {
@@ -15044,6 +15039,10 @@ static void bgp_config_write_family(struct vty *vty, struct bgp *bgp, afi_t afi,
 
        bgp_config_write_redistribute(vty, bgp, afi, safi);
 
+       /* BGP flag dampening. */
+       if (CHECK_FLAG(bgp->af_flags[afi][safi], BGP_CONFIG_DAMPENING))
+               bgp_config_write_damp(vty, afi, safi);
+
        for (ALL_LIST_ELEMENTS(bgp->group, node, nnode, group))
                bgp_config_write_peer_af(vty, bgp, group->conf, afi, safi);