From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Dec 2015 13:42:36 +0000 (+0000)
Subject: bgpd: Use actual MULTIPATH_NUM as the limitor
X-Git-Tag: frr-2.0-rc1~1175
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d5b77cc20d60238aea03c600e912b99022ea06dd;p=mirror%2Ffrr.git

bgpd: Use actual MULTIPATH_NUM as the limitor

BGP uses a second #define that is equal to MULTIPATH_NUM.  There
is no point in having a different #define.  Just consolidate.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c
index cf92bb1514..496ccdf11b 100644
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@ -83,11 +83,11 @@ bgp_maximum_paths_unset (struct bgp *bgp, afi_t afi, safi_t safi,
   switch (peertype)
     {
     case BGP_PEER_IBGP:
-      bgp->maxpaths[afi][safi].maxpaths_ibgp = BGP_DEFAULT_MAXPATHS;
+      bgp->maxpaths[afi][safi].maxpaths_ibgp = MULTIPATH_NUM;
       bgp->maxpaths[afi][safi].ibgp_flags = 0;
       break;
     case BGP_PEER_EBGP:
-      bgp->maxpaths[afi][safi].maxpaths_ebgp = BGP_DEFAULT_MAXPATHS;
+      bgp->maxpaths[afi][safi].maxpaths_ebgp = MULTIPATH_NUM;
       break;
     default:
       return -1;
@@ -429,7 +429,7 @@ bgp_info_mpath_update (struct bgp_node *rn, struct bgp_info *new_best,
   char pfx_buf[PREFIX2STR_BUFFER], nh_buf[2][INET6_ADDRSTRLEN];
 
   mpath_changed = 0;
-  maxpaths = BGP_DEFAULT_MAXPATHS;
+  maxpaths = MULTIPATH_NUM;
   mpath_count = 0;
   cur_mpath = NULL;
   old_mpath_count = 0;
diff --git a/bgpd/bgp_mpath.h b/bgpd/bgp_mpath.h
index 1e112f0ec7..9120ca3433 100644
--- a/bgpd/bgp_mpath.h
+++ b/bgpd/bgp_mpath.h
@@ -27,9 +27,6 @@
 /* Limit on number of configured maxpaths */
 #define BGP_MAXIMUM_MAXPATHS 255
 
-/* BGP default maximum-paths */
-#define BGP_DEFAULT_MAXPATHS MULTIPATH_NUM
-
 /* Supplemental information linked to bgp_info for keeping track of
  * multipath selections, lazily allocated to save memory
  */
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 1bde623fcc..a733c80682 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1463,14 +1463,14 @@ int
 bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi,
 			   safi_t safi, int *write)
 {
-  if (bgp->maxpaths[afi][safi].maxpaths_ebgp != BGP_DEFAULT_MAXPATHS)
+  if (bgp->maxpaths[afi][safi].maxpaths_ebgp != MULTIPATH_NUM)
     {
       bgp_config_write_family_header (vty, afi, safi, write);
       vty_out (vty, "  maximum-paths %d%s",
 	       bgp->maxpaths[afi][safi].maxpaths_ebgp, VTY_NEWLINE);
     }
 
-  if (bgp->maxpaths[afi][safi].maxpaths_ibgp != BGP_DEFAULT_MAXPATHS)
+  if (bgp->maxpaths[afi][safi].maxpaths_ibgp != MULTIPATH_NUM)
     {
       bgp_config_write_family_header (vty, afi, safi, write);
       vty_out (vty, "  maximum-paths ibgp %d",
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index ea66dc3b3c..9514f4de18 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2728,8 +2728,8 @@ bgp_create (as_t *as, const char *name)
 	bgp->rib[afi][safi] = bgp_table_init (afi, safi);
 
         /* Enable maximum-paths */
-        bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_EBGP, BGP_DEFAULT_MAXPATHS, 0);
-        bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_IBGP, BGP_DEFAULT_MAXPATHS, 0);
+        bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_EBGP, MULTIPATH_NUM, 0);
+        bgp_maximum_paths_set (bgp, afi, safi, BGP_PEER_IBGP, MULTIPATH_NUM, 0);
       }
 
   bgp->v_update_delay = BGP_UPDATE_DELAY_DEF;
diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index 7053ad7642..e937784aae 100644
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgp_mpath_test.c
@@ -113,8 +113,8 @@ bgp_create_fake (as_t *as, const char *name)
         bgp->route[afi][safi] = bgp_table_init (afi, safi);
         bgp->aggregate[afi][safi] = bgp_table_init (afi, safi);
         bgp->rib[afi][safi] = bgp_table_init (afi, safi);
-        bgp->maxpaths[afi][safi].maxpaths_ebgp = BGP_DEFAULT_MAXPATHS;
-        bgp->maxpaths[afi][safi].maxpaths_ibgp = BGP_DEFAULT_MAXPATHS;
+        bgp->maxpaths[afi][safi].maxpaths_ebgp = MULTIPATH_NUM;
+        bgp->maxpaths[afi][safi].maxpaths_ibgp = MULTIPATH_NUM;
       }
 
   bgp->default_local_pref = BGP_DEFAULT_LOCAL_PREF;
@@ -171,9 +171,9 @@ run_bgp_cfg_maximum_paths (testcase_t *t)
         api_result = bgp_maximum_paths_unset (bgp, afi, safi, BGP_PEER_IBGP);
         EXPECT_TRUE (api_result == 0, test_result);
         EXPECT_TRUE ((bgp->maxpaths[afi][safi].maxpaths_ebgp ==
-                      BGP_DEFAULT_MAXPATHS), test_result);
+                      MULTIPATH_NUM), test_result);
         EXPECT_TRUE ((bgp->maxpaths[afi][safi].maxpaths_ibgp ==
-                      BGP_DEFAULT_MAXPATHS), test_result);
+                      MULTIPATH_NUM), test_result);
       }
 
   return test_result;