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

Merge pull request #798 from dwalton76/CMD_RANGE_STR

Browse Source 
bgpd: --enable-multipath=256 setting is ignored
This commit is contained in:
David Lamparter 2017-07-13 14:58:52 +02:00 committed by GitHub
commit 76ac0fe511
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bgpd/bgp_vty.c
View File

@ -1487,7 +1487,7 @@ DEFUN (no_bgp_coalesce_time,
/* Maximum-paths configuration */ /* Maximum-paths configuration */
DEFUN (bgp_maxpaths, DEFUN (bgp_maxpaths,
bgp_maxpaths_cmd, bgp_maxpaths_cmd,
"maximum-paths (1-255)", "maximum-paths " CMD_RANGE_STR(1, MULTIPATH_NUM),
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"Number of paths\n") "Number of paths\n")
{ {
@ -1497,13 +1497,13 @@ DEFUN (bgp_maxpaths,
ALIAS_HIDDEN (bgp_maxpaths, ALIAS_HIDDEN (bgp_maxpaths,
bgp_maxpaths_hidden_cmd, bgp_maxpaths_hidden_cmd,
"maximum-paths (1-255)", "maximum-paths " CMD_RANGE_STR(1, MULTIPATH_NUM),
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"Number of paths\n") "Number of paths\n")
DEFUN (bgp_maxpaths_ibgp, DEFUN (bgp_maxpaths_ibgp,
bgp_maxpaths_ibgp_cmd, bgp_maxpaths_ibgp_cmd,
"maximum-paths ibgp (1-255)", "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM),
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"iBGP-multipath\n" "iBGP-multipath\n"
"Number of paths\n") "Number of paths\n")
@ -1514,14 +1514,14 @@ DEFUN (bgp_maxpaths_ibgp,
ALIAS_HIDDEN (bgp_maxpaths_ibgp, ALIAS_HIDDEN (bgp_maxpaths_ibgp,
bgp_maxpaths_ibgp_hidden_cmd, bgp_maxpaths_ibgp_hidden_cmd,
"maximum-paths ibgp (1-255)", "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM),
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"iBGP-multipath\n" "iBGP-multipath\n"
"Number of paths\n") "Number of paths\n")
DEFUN (bgp_maxpaths_ibgp_cluster, DEFUN (bgp_maxpaths_ibgp_cluster,
bgp_maxpaths_ibgp_cluster_cmd, bgp_maxpaths_ibgp_cluster_cmd,
"maximum-paths ibgp (1-255) equal-cluster-length", "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM) " equal-cluster-length",
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"iBGP-multipath\n" "iBGP-multipath\n"
"Number of paths\n" "Number of paths\n"
@ -1534,7 +1534,7 @@ DEFUN (bgp_maxpaths_ibgp_cluster,
ALIAS_HIDDEN (bgp_maxpaths_ibgp_cluster, ALIAS_HIDDEN (bgp_maxpaths_ibgp_cluster,
bgp_maxpaths_ibgp_cluster_hidden_cmd, bgp_maxpaths_ibgp_cluster_hidden_cmd,
"maximum-paths ibgp (1-255) equal-cluster-length", "maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM) " equal-cluster-length",
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"iBGP-multipath\n" "iBGP-multipath\n"
"Number of paths\n" "Number of paths\n"
@ -1542,7 +1542,7 @@ ALIAS_HIDDEN (bgp_maxpaths_ibgp_cluster,
DEFUN (no_bgp_maxpaths, DEFUN (no_bgp_maxpaths,
no_bgp_maxpaths_cmd, no_bgp_maxpaths_cmd,
"no maximum-paths [(1-255)]", "no maximum-paths [" CMD_RANGE_STR(1, MULTIPATH_NUM) "]",
NO_STR NO_STR
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"Number of paths\n") "Number of paths\n")
@ -1552,14 +1552,14 @@ DEFUN (no_bgp_maxpaths,
ALIAS_HIDDEN (no_bgp_maxpaths, ALIAS_HIDDEN (no_bgp_maxpaths,
no_bgp_maxpaths_hidden_cmd, no_bgp_maxpaths_hidden_cmd,
"no maximum-paths [(1-255)]", "no maximum-paths [" CMD_RANGE_STR(1, MULTIPATH_NUM) "]",
NO_STR NO_STR
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"Number of paths\n") "Number of paths\n")
DEFUN (no_bgp_maxpaths_ibgp, DEFUN (no_bgp_maxpaths_ibgp,
no_bgp_maxpaths_ibgp_cmd, no_bgp_maxpaths_ibgp_cmd,
"no maximum-paths ibgp [(1-255) [equal-cluster-length]]", "no maximum-paths ibgp [" CMD_RANGE_STR(1, MULTIPATH_NUM) " [equal-cluster-length]]",
NO_STR NO_STR
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"iBGP-multipath\n" "iBGP-multipath\n"
@ -1571,7 +1571,7 @@ DEFUN (no_bgp_maxpaths_ibgp,
ALIAS_HIDDEN (no_bgp_maxpaths_ibgp, ALIAS_HIDDEN (no_bgp_maxpaths_ibgp,
no_bgp_maxpaths_ibgp_hidden_cmd, no_bgp_maxpaths_ibgp_hidden_cmd,
"no maximum-paths ibgp [(1-255) [equal-cluster-length]]", "no maximum-paths ibgp [" CMD_RANGE_STR(1, MULTIPATH_NUM) " [equal-cluster-length]]",
NO_STR NO_STR
"Forward packets over multiple paths\n" "Forward packets over multiple paths\n"
"iBGP-multipath\n" "iBGP-multipath\n"

1
lib/command.h
View File

@ -293,6 +293,7 @@ struct cmd_node
*/ */
#define CMD_CREATE_STR(s) CMD_CREATE_STR_HELPER(s) #define CMD_CREATE_STR(s) CMD_CREATE_STR_HELPER(s)
#define CMD_CREATE_STR_HELPER(s) #s #define CMD_CREATE_STR_HELPER(s) #s
#define CMD_RANGE_STR(a,s) "(" CMD_CREATE_STR(a) "-" CMD_CREATE_STR(s) ")"
/* Common descriptions. */ /* Common descriptions. */
#define SHOW_STR "Show running system information\n" #define SHOW_STR "Show running system information\n"