summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-03-08 01:56:02 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2017-03-08 01:58:43 +0100
commit2fcc7988ea09b8505c0fbf134ecffe98e4c026b6 (patch)
tree08ce899248d37a102c3be14136ec7103c59b37a8
parentlib: time: remove leftover declarations (diff)
downloadfrr-2fcc7988ea09b8505c0fbf134ecffe98e4c026b6.tar.xz
frr-2fcc7988ea09b8505c0fbf134ecffe98e4c026b6.zip
*: fix some option descriptions and make -e work
There were some typos in command line help, also the "e:" spec was missing for getopt in zebra/bgpd (even before the refactor). Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
-rw-r--r--bgpd/bgp_main.c2
-rw-r--r--ospfd/ospf_main.c2
-rw-r--r--zebra/main.c17
3 files changed, 11 insertions, 10 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 5bf200727..423c9453e 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -365,7 +365,7 @@ main (int argc, char **argv)
char *bgp_address = NULL;
frr_preinit(&bgpd_di, argc, argv);
- frr_opt_add("p:l:rn", longopts,
+ frr_opt_add("p:l:rne:", longopts,
" -p, --bgp_port Set bgp protocol's port number\n"
" -l, --listenon Listen on specified address (implies -n)\n"
" -r, --retain When program terminates, retain added route by bgpd.\n"
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index fd17458d3..5705dad5d 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -175,7 +175,7 @@ main (int argc, char **argv)
frr_preinit (&ospfd_di, argc, argv);
frr_opt_add ("n:a", longopts,
" -n, --instance Set the instance id\n"
- " -a. --apiserver Enable OSPF apiserver\n");
+ " -a, --apiserver Enable OSPF apiserver\n");
while (1)
{
diff --git a/zebra/main.c b/zebra/main.c
index bbfae3bb5..b70ce7eda 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -223,19 +223,20 @@ main (int argc, char **argv)
frr_preinit(&zebra_di, argc, argv);
- frr_opt_add("bakF:z:r"
+ frr_opt_add("bakF:z:e:r"
#ifdef HAVE_NETLINK
"s:"
#endif
, longopts,
- "-b, --batch Runs in batch mode\n"
- "-a, --allow_delete Allow other processes to delete Quagga Routes\n"
- "-F, --fpm_format Set fpm format to 'netlink' or 'protobuf'\n"
- "-z, --socket Set path of zebra socket\n"
- "-k, --keep_kernel Don't delete old routes which installed by zebra.\n"
- "-r, --retain When program terminates, retain added route by zebra.\n"
+ " -b, --batch Runs in batch mode\n"
+ " -a, --allow_delete Allow other processes to delete Quagga Routes\n"
+ " -F, --fpm_format Set fpm format to 'netlink' or 'protobuf'\n"
+ " -z, --socket Set path of zebra socket\n"
+ " -e, --ecmp Specify ECMP to use.\n"
+ " -k, --keep_kernel Don't delete old routes which installed by zebra.\n"
+ " -r, --retain When program terminates, retain added route by zebra.\n"
#ifdef HAVE_NETLINK
- "-s, --nl-bufsize Set netlink receive buffer size\n"
+ " -s, --nl-bufsize Set netlink receive buffer size\n"
#endif /* HAVE_NETLINK */
);