proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 08:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "bgpd: Respect -e X value for multipath"

Browse Source 
This reverts commit 76bd07b688.
This commit is contained in:
Igor Ryzhov 2021-05-14 01:50:05 +03:00
parent 56ceae8462
commit 6a6affc6b7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bgpd/bgp_nb_config.c
View File

@ -9023,10 +9023,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_use_multiple_paths_ebgp_maximum_p
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
maxpaths = yang_dnode_get_uint16(args->dnode, NULL); maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
if (maxpaths > multipath_num) { if (maxpaths > MULTIPATH_NUM) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"maxpaths %u is out of range %u", maxpaths, "maxpaths %u is out of range %u", maxpaths,
multipath_num); MULTIPATH_NUM);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;
@ -9094,10 +9094,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_use_multiple_paths_ibgp_maximum_p
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
maxpaths = yang_dnode_get_uint16(args->dnode, NULL); maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
if (maxpaths > multipath_num) { if (maxpaths > MULTIPATH_NUM) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"maxpaths %u is out of range %u", maxpaths, "maxpaths %u is out of range %u", maxpaths,
multipath_num); MULTIPATH_NUM);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;
@ -10942,10 +10942,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_unicast_use_multiple_paths_ebgp_maximum_p
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
maxpaths = yang_dnode_get_uint16(args->dnode, NULL); maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
if (maxpaths > multipath_num) { if (maxpaths > MULTIPATH_NUM) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"maxpaths %u is out of range %u", maxpaths, "maxpaths %u is out of range %u", maxpaths,
multipath_num); MULTIPATH_NUM);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;
@ -11745,10 +11745,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_labeled_unicast_use_multiple_paths_ebgp_m
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
maxpaths = yang_dnode_get_uint16(args->dnode, NULL); maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
if (maxpaths > multipath_num) { if (maxpaths > MULTIPATH_NUM) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"maxpaths %u is out of range %u", maxpaths, "maxpaths %u is out of range %u", maxpaths,
multipath_num); MULTIPATH_NUM);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;
@ -11983,10 +11983,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_labeled_unicast_use_multiple_paths_ebgp_m
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
maxpaths = yang_dnode_get_uint16(args->dnode, NULL); maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
if (maxpaths > multipath_num) { if (maxpaths > MULTIPATH_NUM) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"maxpaths %u is out of range %u", maxpaths, "maxpaths %u is out of range %u", maxpaths,
multipath_num); MULTIPATH_NUM);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;
@ -12013,10 +12013,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_labeled_unicast_use_multiple_paths_ibgp_m
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
maxpaths = yang_dnode_get_uint16(args->dnode, NULL); maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
if (maxpaths > multipath_num) { if (maxpaths > MULTIPATH_NUM) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"maxpaths %u is out of range %u", maxpaths, "maxpaths %u is out of range %u", maxpaths,
multipath_num); MULTIPATH_NUM);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;