]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: sh running config is not considering values provided via -e for max-paths
authorvdhingra <vdhingra@vmware.com>
Thu, 19 Nov 2020 12:46:39 +0000 (04:46 -0800)
committervdhingra <vdhingra@vmware.com>
Fri, 20 Nov 2020 10:32:18 +0000 (02:32 -0800)
problem
1. run the bgp with -e1 option
2. c t
   router bgp 100
3. show running config
    !
     address-family ipv6 multicast
      maximum-paths 1
      maximum-paths ibgp 1
     exit-address-family
    !
address families should not dump maximum-paths if there
value is same as value provided at run time.

fix
if the maxpaths_ebgp value is same as multipath_num global
object, don't dump maximum-paths.

Signed-off-by: vishaldhingra <vdhingra@vmware.com>
bgpd/bgp_vty.c

index b08ec827de61dcea2448bc3393ddae5486437d50..d455978f3e6395aec369c0e6ad15b2b4bd95110d 100644 (file)
@@ -2352,12 +2352,12 @@ ALIAS_HIDDEN(no_bgp_maxpaths_ibgp, no_bgp_maxpaths_ibgp_hidden_cmd,
 static void bgp_config_write_maxpaths(struct vty *vty, struct bgp *bgp,
                                      afi_t afi, safi_t safi)
 {
-       if (bgp->maxpaths[afi][safi].maxpaths_ebgp != MULTIPATH_NUM) {
+       if (bgp->maxpaths[afi][safi].maxpaths_ebgp != multipath_num) {
                vty_out(vty, "  maximum-paths %d\n",
                        bgp->maxpaths[afi][safi].maxpaths_ebgp);
        }
 
-       if (bgp->maxpaths[afi][safi].maxpaths_ibgp != MULTIPATH_NUM) {
+       if (bgp->maxpaths[afi][safi].maxpaths_ibgp != multipath_num) {
                vty_out(vty, "  maximum-paths ibgp %d",
                        bgp->maxpaths[afi][safi].maxpaths_ibgp);
                if (CHECK_FLAG(bgp->maxpaths[afi][safi].ibgp_flags,