proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-17 02:50:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7514 from donaldsharp/respect_e

Browse Source 
bgpd: Respect `-e X` value for multipath
This commit is contained in:
Donatas Abraitis 2020-11-16 08:57:50 +02:00 committed by GitHub
commit 9d96143b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -9079,10 +9079,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;
@ -9150,10 +9150,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;
@ -10997,10 +10997,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;
@ -11759,10 +11759,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;
@ -11997,10 +11997,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;
@ -12027,10 +12027,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;