diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-09-22 17:15:50 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-09-22 17:15:50 +0200 |
| commit | 4dcadbefd00d7c4c97a16f3adc591bd4478965df (patch) | |
| tree | acecbc7c32d2478e02018dfbcb230b2a6a9d4c39 /lib | |
| parent | Added argv_translator.py (diff) | |
| download | frr-4dcadbefd00d7c4c97a16f3adc591bd4478965df.tar.xz frr-4dcadbefd00d7c4c97a16f3adc591bd4478965df.zip | |
bgpd: argv update for all but bgp_vty.c
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.h | 14 | ||||
| -rw-r--r-- | lib/json.c | 2 | ||||
| -rw-r--r-- | lib/json.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/command.h b/lib/command.h index eef4b558a..7b0fbfb78 100644 --- a/lib/command.h +++ b/lib/command.h @@ -372,25 +372,25 @@ struct cmd_element /* IPv4 only machine should not accept IPv6 address for peer's IP address. So we replace VTY command string like below. */ #ifdef HAVE_IPV6 -#define NEIGHBOR_CMD "neighbor <A.B.C.D|X:X::X:X> " -#define NO_NEIGHBOR_CMD "no neighbor <A.B.C.D|X:X::X:X> " +#define NEIGHBOR_CMD "neighbor (A.B.C.D|X:X::X:X) " +#define NO_NEIGHBOR_CMD "no neighbor (A.B.C.D|X:X::X:X) " #define NEIGHBOR_ADDR_STR "Neighbor address\nIPv6 address\n" -#define NEIGHBOR_CMD2 "neighbor <A.B.C.D|X:X::X:X|WORD> " -#define NO_NEIGHBOR_CMD2 "no neighbor <A.B.C.D|X:X::X:X|WORD> " +#define NEIGHBOR_CMD2 "neighbor (A.B.C.D|X:X::X:X|WORD) " +#define NO_NEIGHBOR_CMD2 "no neighbor (A.B.C.D|X:X::X:X|WORD) " #define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6 address\nInterface name or neighbor tag\n" #define NEIGHBOR_ADDR_STR3 "Neighbor address\nIPv6 address\nInterface name\n" #else #define NEIGHBOR_CMD "neighbor A.B.C.D " #define NO_NEIGHBOR_CMD "no neighbor A.B.C.D " #define NEIGHBOR_ADDR_STR "Neighbor address\n" -#define NEIGHBOR_CMD2 "neighbor <A.B.C.D|WORD> " -#define NO_NEIGHBOR_CMD2 "no neighbor <A.B.C.D|WORD> " +#define NEIGHBOR_CMD2 "neighbor (A.B.C.D|WORD) " +#define NO_NEIGHBOR_CMD2 "no neighbor (A.B.C.D|WORD) " #define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor tag\n" #endif /* HAVE_IPV6 */ /* Dynamic neighbor (listen range) configuration */ #ifdef HAVE_IPV6 -#define LISTEN_RANGE_CMD "bgp listen range <A.B.C.D/M|X:X::X:X/M> " +#define LISTEN_RANGE_CMD "bgp listen range (A.B.C.D/M|X:X::X:X/M) " #define LISTEN_RANGE_ADDR_STR "Neighbor address\nNeighbor IPv6 address\n" #else #define LISTEN_RANGE_CMD "bgp listen range A.B.C.D/M " diff --git a/lib/json.c b/lib/json.c index d06bacece..1d22180e1 100644 --- a/lib/json.c +++ b/lib/json.c @@ -30,7 +30,7 @@ * what. */ int -use_json (const int argc, const struct cmd_token *argv[]) +use_json (const int argc, struct cmd_token *argv[]) { if (argc == 0) return 0; diff --git a/lib/json.h b/lib/json.h index 25fceb105..3fcfe340e 100644 --- a/lib/json.h +++ b/lib/json.h @@ -28,7 +28,7 @@ #include <json/json.h> #endif -extern int use_json(const int argc, const struct cmd_token *argv[]); +extern int use_json(const int argc, struct cmd_token *argv[]); extern void json_object_string_add(struct json_object* obj, const char *key, const char *s); extern void json_object_int_add(struct json_object* obj, const char *key, |