diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2020-11-16 08:57:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 08:57:50 +0200 |
| commit | 9d96143b50f04713af24eef8cfd9f2652fc512e9 (patch) | |
| tree | 3d6aff5df76f126c72b307b6a542f042160625a3 | |
| parent | 4b18f174375e8e603e004195de262c409045d210 (diff) | |
| parent | 76bd07b6881add1fbeafa5dc11c48d9ad6a00f14 (diff) | |
Merge pull request #7514 from donaldsharp/respect_e
bgpd: Respect `-e X` value for multipath
| -rw-r--r-- | bgpd/bgp_nb_config.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c index e2818988ea..ee6b13278d 100644 --- a/bgpd/bgp_nb_config.c +++ b/bgpd/bgp_nb_config.c @@ -9079,10 +9079,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_use_multiple_paths_ebgp_maximum_p switch (args->event) { case NB_EV_VALIDATE: maxpaths = yang_dnode_get_uint16(args->dnode, NULL); - if (maxpaths > MULTIPATH_NUM) { + if (maxpaths > multipath_num) { snprintf(args->errmsg, args->errmsg_len, "maxpaths %u is out of range %u", maxpaths, - MULTIPATH_NUM); + multipath_num); return NB_ERR_VALIDATION; } break; @@ -9150,10 +9150,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_use_multiple_paths_ibgp_maximum_p switch (args->event) { case NB_EV_VALIDATE: maxpaths = yang_dnode_get_uint16(args->dnode, NULL); - if (maxpaths > MULTIPATH_NUM) { + if (maxpaths > multipath_num) { snprintf(args->errmsg, args->errmsg_len, "maxpaths %u is out of range %u", maxpaths, - MULTIPATH_NUM); + multipath_num); return NB_ERR_VALIDATION; } break; @@ -10997,10 +10997,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_unicast_use_multiple_paths_ebgp_maximum_p switch (args->event) { case NB_EV_VALIDATE: maxpaths = yang_dnode_get_uint16(args->dnode, NULL); - if (maxpaths > MULTIPATH_NUM) { + if (maxpaths > multipath_num) { snprintf(args->errmsg, args->errmsg_len, "maxpaths %u is out of range %u", maxpaths, - MULTIPATH_NUM); + multipath_num); return NB_ERR_VALIDATION; } break; @@ -11759,10 +11759,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_labeled_unicast_use_multiple_paths_ebgp_m switch (args->event) { case NB_EV_VALIDATE: maxpaths = yang_dnode_get_uint16(args->dnode, NULL); - if (maxpaths > MULTIPATH_NUM) { + if (maxpaths > multipath_num) { snprintf(args->errmsg, args->errmsg_len, "maxpaths %u is out of range %u", maxpaths, - MULTIPATH_NUM); + multipath_num); return NB_ERR_VALIDATION; } break; @@ -11997,10 +11997,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_labeled_unicast_use_multiple_paths_ebgp_m switch (args->event) { case NB_EV_VALIDATE: maxpaths = yang_dnode_get_uint16(args->dnode, NULL); - if (maxpaths > MULTIPATH_NUM) { + if (maxpaths > multipath_num) { snprintf(args->errmsg, args->errmsg_len, "maxpaths %u is out of range %u", maxpaths, - MULTIPATH_NUM); + multipath_num); return NB_ERR_VALIDATION; } break; @@ -12027,10 +12027,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_labeled_unicast_use_multiple_paths_ibgp_m switch (args->event) { case NB_EV_VALIDATE: maxpaths = yang_dnode_get_uint16(args->dnode, NULL); - if (maxpaths > MULTIPATH_NUM) { + if (maxpaths > multipath_num) { snprintf(args->errmsg, args->errmsg_len, "maxpaths %u is out of range %u", maxpaths, - MULTIPATH_NUM); + multipath_num); return NB_ERR_VALIDATION; } break; |