From e9f4eeaa574f8ca548f89962ab440df8902756ae Mon Sep 17 00:00:00 2001 From: Job Snijders Date: Tue, 31 Dec 2019 14:04:26 +0100 Subject: [PATCH] Update usage() --- README.md | 2 +- bgpq4.8 | 2 +- bgpq4.c | 44 +++++++++++++++++++++++++------------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 0354f2c..0efd210 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ Generate as-sets for OpenBGPD (OpenBSD 6.4+), BIRD and JSON formats. #### -T -Disable pipelining. (not recommended) +Disable pipelining (not recommended). #### -U diff --git a/bgpq4.8 b/bgpq4.8 index f54ae0d..2ef891b 100644 --- a/bgpq4.8 +++ b/bgpq4.8 @@ -117,7 +117,7 @@ use specified sources only (recommended: RADB,RIPE,APNIC). .It Fl t generate as-sets for OpenBGPD (OpenBSD 6.4+), BIRD and JSON formats. .It Fl T -disable pipelining. +disable pipelining (not recommended). .It Fl W Ar len generate as-path strings of no more than len items (use 0 for inifinity). .It Fl U diff --git a/bgpq4.c b/bgpq4.c index 0aeddf6..b9aa203 100644 --- a/bgpq4.c +++ b/bgpq4.c @@ -27,48 +27,54 @@ int usage(int ecode) { printf("\nUsage: bgpq4 [-h host[:port]] [-S sources] [-E|G " - "|f |t] [-46ABbdJjKNnwXz] [-R len] ...\n"); + "|f |t] [-46ABbdJjKNnwXz] [-R len] ... " + "[EXCEPT ...]\n"); + printf("\nVendor targets:\n"); + printf(" no option : Cisco IOS Classic (default)\n"); + printf(" -X : Cisco IOS XR\n"); + printf(" -U : Huawei\n"); + printf(" -j : JSON\n"); + printf(" -J : Juniper Junos\n"); + printf(" -K : MikroTik RouterOS\n"); + printf(" -b : NIC.CZ BIRD\n"); + printf(" -N : Nokia SR OS (Classic CLI)\n"); + printf(" -n : Nokia SR OS (MD-CLI)\n"); + printf(" -B : OpenBSD OpenBGPD\n"); + printf("\n"); + printf("Output modifiers:\n"); printf(" -4 : generate IPv4 prefix-lists (default)\n"); printf(" -6 : generate IPv6 prefix-lists\n"); printf(" -A : try to aggregate prefix-lists/route-filters\n"); - printf(" -B : generate OpenBGPD output\n"); - printf(" -b : generate BIRD output\n"); - printf(" -d : generate some debugging output\n"); - printf(" -E : generate extended access-list(Cisco), " + printf(" -E : generate extended access-list (Cisco), " "route-filter (Juniper)\n" " [ip|ipv6]-prefix-list (Nokia) or prefix-set " "(OpenBGPD)\n"); printf(" -F fmt : generate output in user-defined format\n"); printf(" -f number : generate input as-path access-list\n"); printf(" -G number : generate output as-path access-list\n"); - printf(" -h host : host running IRRD software (rr.ntt.net by " - "default)\n" - " (use host:port to specify alternate port)\n"); - printf(" -J : generate config for JunOS\n"); - printf(" -j : generate JSON output\n"); - printf(" -K : generate config for MikroTik RouterOS\n"); printf(" -M match : extra match conditions for JunOS route-filters\n"); printf(" -m len : maximum prefix length (default: 32 for IPv4, " "128 for IPv6)\n"); printf(" -L depth : limit recursion depth (default: unlimited)\n"), printf(" -l name : use specified name for generated access/prefix/.." " list\n"); - printf(" -N : generate config for Nokia SR OS classic CLI\n"); - printf(" -n : generate config for Nokia SR OS MD-CLI\n"); printf(" -R len : allow more specific routes up to specified masklen\n"); printf(" -r len : allow more specific routes from masklen specified\n"); - printf(" -S sources: use only specified sources (recommended:" - " RADB,RIPE,APNIC)\n"); printf(" -s : generate sequence numbers in prefix-lists (IOS only)\n"); - printf(" -T : disable pipelining (experimental, faster mode)\n"); - printf(" -t : generate as-sets for OpenBGPD (OpenBSD 6.4+), BIRD " + printf(" -t : generate as-sets for OpenBGPD (OpenBGPD 6.4+), BIRD " "and JSON formats\n"); - printf(" -U : generate config for Huawei\n"); + printf(" -z : generate route-filter-list (Junos only)\n"); printf(" -W len : specify max-entries on as-path line (use 0 for " "infinity)\n"); printf(" -w : 'validate' AS numbers: accept only ones with " "registered routes\n"); - printf(" -X : generate Cisco IOS XR output\n"); + printf("\n"); + printf("Utility operations:\n"); + printf(" -d : generate some debugging output\n"); + printf(" -h host : host running IRRD software (default: rr.ntt.net)\n" + " use 'host:port' to specify alternate port\n"); + printf(" -S sources: only use specified IRR sources, in the specified order\n"); + printf(" -T : disable pipelining (not recommended)\n"); printf("\n" PACKAGE_NAME " version: " PACKAGE_VERSION "\n"); exit(ecode); }