diff options
-rw-r--r-- | bgpd/bgp_mplsvpn.c | 4 | ||||
-rw-r--r-- | bgpd/bgp_route.c | 17 | ||||
-rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.c | 84 | ||||
-rw-r--r-- | bgpd/rfapi/rfapi.c | 99 | ||||
-rw-r--r-- | bgpd/rfapi/rfapi_vty.c | 100 | ||||
-rw-r--r-- | bgpd/rfapi/vnc_debug.c | 2 | ||||
-rw-r--r-- | bgpd/rfp-example/librfp/rfp_example.c | 4 | ||||
-rw-r--r-- | lib/distribute.c | 1 | ||||
-rw-r--r-- | ospfd/ospf_vty.c | 25 | ||||
-rwxr-xr-x | vtysh/extract.pl.in | 1 |
10 files changed, 201 insertions, 136 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 29c8383e8..16f08aad6 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -538,7 +538,9 @@ DEFUN (vpnv6_network, "Specify Route Distinguisher\n" "VPN Route Distinguisher\n" "BGP tag\n" - "tag value\n") + "tag value\n" + "route map\n" + "route map name\n") { int idx_ipv6_prefix = 1; int idx_ext_community = 3; diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index d2abb40ca..26c500af1 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -7835,7 +7835,7 @@ bgp_show_route (struct vty *vty, const char *view_name, const char *ip_str, /* BGP route print out function. */ DEFUN (show_ip_bgp_ipv4, show_ip_bgp_ipv4_cmd, - "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]]\ + "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6> [<unicast|multicast|vpn|encap>]]\ [<\ cidr-only\ |dampening <flap-statistics|dampened-paths|parameters>\ @@ -7845,18 +7845,13 @@ DEFUN (show_ip_bgp_ipv4, |community [<AA:NN|local-AS|no-advertise|no-export> [exact-match]]\ |community-list <(1-500)|WORD> [exact-match]\ |A.B.C.D/M longer-prefixes\ - |X:X::X:X/M longer-prefixes\ - >]\ - [json]", + |X:X::X:X/M longer-prefixes>\ + ] [json]", SHOW_STR IP_STR BGP_STR BGP_INSTANCE_HELP_STR "Address Family\n" - "Address Family modifier\n" - "Address Family modifier\n" - "Address Family modifier\n" - "Address Family modifier\n" "Address Family\n" "Address Family modifier\n" "Address Family modifier\n" @@ -7982,17 +7977,13 @@ DEFUN (show_ip_bgp_ipv4, DEFUN (show_ip_bgp_route, show_ip_bgp_route_cmd, - "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]]" + "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6> [<unicast|multicast|vpn|encap>]]" "<A.B.C.D|A.B.C.D/M|X:X::X:X|X:X::X:X/M> [<bestpath|multipath>] [json]", SHOW_STR IP_STR BGP_STR BGP_INSTANCE_HELP_STR "Address Family\n" - "Address Family modifier\n" - "Address Family modifier\n" - "Address Family modifier\n" - "Address Family modifier\n" "Address Family\n" "Address Family modifier\n" "Address Family modifier\n" diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index faa35503b..ab9a24e83 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -291,7 +291,7 @@ bgp_rfapi_is_vnc_configured (struct bgp *bgp) DEFUN (vnc_advertise_un_method, vnc_advertise_un_method_cmd, - "vnc advertise-un-method (encap-safi|encap-attr)", + "vnc advertise-un-method <encap-safi|encap-attr>", VNC_CONFIG_STR "Method of advertising UN addresses\n" "Via Encapsulation SAFI\n" @@ -375,7 +375,7 @@ set_ecom_list ( DEFUN (vnc_defaults_rt_import, vnc_defaults_rt_import_cmd, - "rt import .RTLIST", + "rt import RTLIST...", "Specify default route targets\n" "Import filter\n" "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n") @@ -387,7 +387,7 @@ DEFUN (vnc_defaults_rt_import, DEFUN (vnc_defaults_rt_export, vnc_defaults_rt_export_cmd, - "rt export .RTLIST", + "rt export RTLIST...", "Configure default route targets\n" "Export filter\n" "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n") @@ -399,7 +399,7 @@ DEFUN (vnc_defaults_rt_export, DEFUN (vnc_defaults_rt_both, vnc_defaults_rt_both_cmd, - "rt both .RTLIST", + "rt both RTLIST...", "Configure default route targets\n" "Export+import filters\n" "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n") @@ -473,7 +473,7 @@ DEFUN (vnc_defaults_rd, DEFUN (vnc_defaults_l2rd, vnc_defaults_l2rd_cmd, - "l2rd (ID|auto:vn)", + "l2rd <(1-255)|auto-vn>", "Specify default Local Nve ID value to use in RD for L2 routes\n" "Fixed value 1-255\n" "use the low-order octet of the NVE's VN address\n") @@ -481,7 +481,7 @@ DEFUN (vnc_defaults_l2rd, VTY_DECLVAR_CONTEXT(bgp, bgp); uint8_t value = 0; - if (!strcmp (argv[1]->arg, "auto:vn")) + if (!strcmp (argv[1]->arg, "auto-vn")) { value = 0; } @@ -527,7 +527,7 @@ DEFUN (vnc_defaults_no_l2rd, DEFUN (vnc_defaults_responselifetime, vnc_defaults_responselifetime_cmd, - "response-lifetime (LIFETIME|infinite)", + "response-lifetime <LIFETIME|infinite>", "Specify default response lifetime\n" "Response lifetime in seconds\n" "Infinite response lifetime\n") { @@ -779,7 +779,7 @@ vnc_redistribute_postchange (struct bgp *bgp) DEFUN (vnc_redistribute_rh_roo_localadmin, vnc_redistribute_rh_roo_localadmin_cmd, - "vnc redistribute resolve-nve roo-ec-local-admin <0-65535>", + "vnc redistribute resolve-nve roo-ec-local-admin (0-65535)", VNC_CONFIG_STR "Redistribute routes into VNC\n" "Resolve-NVE mode\n" @@ -835,7 +835,7 @@ DEFUN (vnc_redistribute_rh_roo_localadmin, DEFUN (vnc_redistribute_mode, vnc_redistribute_mode_cmd, - "vnc redistribute mode (nve-group|plain|resolve-nve)", + "vnc redistribute mode <nve-group|plain|resolve-nve>", VNC_CONFIG_STR "Redistribute routes into VNC\n" "Redistribution mode\n" @@ -883,7 +883,7 @@ DEFUN (vnc_redistribute_mode, DEFUN (vnc_redistribute_protocol, vnc_redistribute_protocol_cmd, - "vnc redistribute (ipv4|ipv6) (bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static)", + "vnc redistribute <ipv4|ipv6> <bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static>", VNC_CONFIG_STR "Redistribute routes into VNC\n" "IPv4 routes\n" @@ -930,7 +930,7 @@ DEFUN (vnc_redistribute_protocol, DEFUN (vnc_no_redistribute_protocol, vnc_no_redistribute_protocol_cmd, - "no vnc redistribute (ipv4|ipv6) (bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static)", + "no vnc redistribute <ipv4|ipv6> <bgp|bgp-direct|bgp-direct-to-nve-groups|connected|kernel|ospf|rip|static>", NO_STR VNC_CONFIG_STR "Redistribute from other protocol\n" @@ -977,7 +977,7 @@ DEFUN (vnc_no_redistribute_protocol, DEFUN (vnc_redistribute_bgp_exterior, vnc_redistribute_bgp_exterior_cmd, - "vnc redistribute (ipv4|ipv6) bgp-direct-to-nve-groups view NAME", + "vnc redistribute <ipv4|ipv6> bgp-direct-to-nve-groups view NAME", VNC_CONFIG_STR "Redistribute routes into VNC\n" "IPv4 routes\n" @@ -1074,10 +1074,12 @@ DEFUN (vnc_redistribute_no_nvegroup, DEFUN (vnc_redistribute_lifetime, vnc_redistribute_lifetime_cmd, - "vnc redistribute lifetime (LIFETIME|infinite)", + "vnc redistribute lifetime <LIFETIME|infinite>", VNC_CONFIG_STR + "Redistribute\n" "Assign a lifetime to routes redistributed from another routing protocol\n" - "lifetime value (32 bit)\n") + "lifetime value (32 bit)\n" + "Allow lifetime to never expire\n") { VTY_DECLVAR_CONTEXT(bgp, bgp); @@ -1108,7 +1110,7 @@ DEFUN (vnc_redistribute_lifetime, DEFUN (vnc_redist_bgpdirect_no_prefixlist, vnc_redist_bgpdirect_no_prefixlist_cmd, - "no vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) (ipv4|ipv6) prefix-list", + "no vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> <ipv4|ipv6> prefix-list", NO_STR VNC_CONFIG_STR "Redistribute from other protocol\n" @@ -1160,7 +1162,7 @@ DEFUN (vnc_redist_bgpdirect_no_prefixlist, DEFUN (vnc_redist_bgpdirect_prefixlist, vnc_redist_bgpdirect_prefixlist_cmd, - "vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) (ipv4|ipv6) prefix-list NAME", + "vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> <ipv4|ipv6> prefix-list NAME", VNC_CONFIG_STR "Redistribute from other protocol\n" "Redistribute from BGP directly\n" @@ -1213,7 +1215,7 @@ DEFUN (vnc_redist_bgpdirect_prefixlist, DEFUN (vnc_redist_bgpdirect_no_routemap, vnc_redist_bgpdirect_no_routemap_cmd, - "no vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) route-map", + "no vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> route-map", NO_STR VNC_CONFIG_STR "Redistribute from other protocols\n" @@ -1254,7 +1256,7 @@ DEFUN (vnc_redist_bgpdirect_no_routemap, DEFUN (vnc_redist_bgpdirect_routemap, vnc_redist_bgpdirect_routemap_cmd, - "vnc redistribute (bgp-direct|bgp-direct-to-nve-groups) route-map NAME", + "vnc redistribute <bgp-direct|bgp-direct-to-nve-groups> route-map NAME", VNC_CONFIG_STR "Redistribute from other protocols\n" "Redistribute from BGP directly\n" @@ -1298,7 +1300,7 @@ DEFUN (vnc_redist_bgpdirect_routemap, DEFUN (vnc_nve_group_redist_bgpdirect_no_prefixlist, vnc_nve_group_redist_bgpdirect_no_prefixlist_cmd, - "no redistribute bgp-direct (ipv4|ipv6) prefix-list", + "no redistribute bgp-direct <ipv4|ipv6> prefix-list", NO_STR "Redistribute from other protocol\n" "Redistribute from BGP directly\n" @@ -1347,7 +1349,7 @@ DEFUN (vnc_nve_group_redist_bgpdirect_no_prefixlist, DEFUN (vnc_nve_group_redist_bgpdirect_prefixlist, vnc_nve_group_redist_bgpdirect_prefixlist_cmd, - "redistribute bgp-direct (ipv4|ipv6) prefix-list NAME", + "redistribute bgp-direct <ipv4|ipv6> prefix-list NAME", "Redistribute from other protocol\n" "Redistribute from BGP directly\n" "IPv4 routes\n" @@ -1478,7 +1480,7 @@ DEFUN (vnc_nve_group_redist_bgpdirect_routemap, DEFUN (vnc_export_mode, vnc_export_mode_cmd, - "vnc export (bgp|zebra) mode (group-nve|ce|none|registering-nve)", + "vnc export <bgp|zebra> mode <group-nve|ce|none|registering-nve>", VNC_CONFIG_STR "Export to other protocols\n" "Export to BGP\n" @@ -1603,7 +1605,7 @@ rfgn_free (struct rfapi_rfg_name *rfgn) DEFUN (vnc_export_nvegroup, vnc_export_nvegroup_cmd, - "vnc export (bgp|zebra) group-nve group NAME", + "vnc export <bgp|zebra> group-nve group NAME", VNC_CONFIG_STR "Export to other protocols\n" "Export to BGP\n" @@ -1704,7 +1706,7 @@ DEFUN (vnc_export_nvegroup, */ DEFUN (vnc_no_export_nvegroup, vnc_no_export_nvegroup_cmd, - "vnc export (bgp|zebra) group-nve no group NAME", + "vnc export <bgp|zebra> group-nve no group NAME", VNC_CONFIG_STR "Export to other protocols\n" "Export to BGP\n" @@ -1764,7 +1766,7 @@ DEFUN (vnc_no_export_nvegroup, DEFUN (vnc_nve_group_export_no_prefixlist, vnc_nve_group_export_no_prefixlist_cmd, - "no export (bgp|zebra) (ipv4|ipv6) prefix-list [NAME]", + "no export <bgp|zebra> <ipv4|ipv6> prefix-list [NAME]", NO_STR "Export to other protocols\n" "Export to BGP\n" @@ -1834,7 +1836,7 @@ DEFUN (vnc_nve_group_export_no_prefixlist, DEFUN (vnc_nve_group_export_prefixlist, vnc_nve_group_export_prefixlist_cmd, - "export (bgp|zebra) (ipv4|ipv6) prefix-list NAME", + "export <bgp|zebra> <ipv4|ipv6> prefix-list NAME", "Export to other protocols\n" "Export to BGP\n" "Export to Zebra (experimental)\n" @@ -1893,7 +1895,7 @@ DEFUN (vnc_nve_group_export_prefixlist, DEFUN (vnc_nve_group_export_no_routemap, vnc_nve_group_export_no_routemap_cmd, - "no export (bgp|zebra) route-map [NAME]", + "no export <bgp|zebra> route-map [NAME]", NO_STR "Export to other protocols\n" "Export to BGP\n" @@ -1953,7 +1955,7 @@ DEFUN (vnc_nve_group_export_no_routemap, DEFUN (vnc_nve_group_export_routemap, vnc_nve_group_export_routemap_cmd, - "export (bgp|zebra) route-map NAME", + "export <bgp|zebra> route-map NAME", "Export to other protocols\n" "Export to BGP\n" "Export to Zebra (experimental)\n" @@ -1999,7 +2001,7 @@ DEFUN (vnc_nve_group_export_routemap, DEFUN (vnc_nve_export_no_prefixlist, vnc_nve_export_no_prefixlist_cmd, - "no vnc export (bgp|zebra) (ipv4|ipv6) prefix-list [NAME]", + "no vnc export <bgp|zebra> <ipv4|ipv6> prefix-list [NAME]", NO_STR VNC_CONFIG_STR "Export to other protocols\n" @@ -2061,7 +2063,7 @@ DEFUN (vnc_nve_export_no_prefixlist, DEFUN (vnc_nve_export_prefixlist, vnc_nve_export_prefixlist_cmd, - "vnc export (bgp|zebra) (ipv4|ipv6) prefix-list NAME", + "vnc export <bgp|zebra> <ipv4|ipv6> prefix-list NAME", VNC_CONFIG_STR "Export to other protocols\n" "Export to BGP\n" @@ -2111,7 +2113,7 @@ DEFUN (vnc_nve_export_prefixlist, DEFUN (vnc_nve_export_no_routemap, vnc_nve_export_no_routemap_cmd, - "no vnc export (bgp|zebra) route-map [NAME]", + "no vnc export <bgp|zebra> route-map [NAME]", NO_STR VNC_CONFIG_STR "Export to other protocols\n" @@ -2163,7 +2165,7 @@ DEFUN (vnc_nve_export_no_routemap, DEFUN (vnc_nve_export_routemap, vnc_nve_export_routemap_cmd, - "vnc export (bgp|zebra) route-map NAME", + "vnc export <bgp|zebra> route-map NAME", VNC_CONFIG_STR "Export to other protocols\n" "Export to BGP\n" @@ -2710,7 +2712,7 @@ DEFUN (vnc_no_nve_group, DEFUN (vnc_nve_group_prefix, vnc_nve_group_prefix_cmd, - "prefix (vn|un) (A.B.C.D/M|X:X::X:X/M)", + "prefix <vn|un> <A.B.C.D/M|X:X::X:X/M>", "Specify prefixes matching NVE VN or UN interfaces\n" "VN prefix\n" "UN prefix\n" @@ -2831,7 +2833,7 @@ DEFUN (vnc_nve_group_prefix, DEFUN (vnc_nve_group_rt_import, vnc_nve_group_rt_import_cmd, - "rt import .RTLIST", + "rt import RTLIST...", "Specify route targets\n" "Import filter\n" "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n") @@ -2901,7 +2903,7 @@ DEFUN (vnc_nve_group_rt_import, DEFUN (vnc_nve_group_rt_export, vnc_nve_group_rt_export_cmd, - "rt export .RTLIST", + "rt export RTLIST...", "Specify route targets\n" "Export filter\n" "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n") @@ -2935,7 +2937,7 @@ DEFUN (vnc_nve_group_rt_export, DEFUN (vnc_nve_group_rt_both, vnc_nve_group_rt_both_cmd, - "rt both .RTLIST", + "rt both RTLIST...", "Specify route targets\n" "Export+import filters\n" "Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)\n") @@ -3021,7 +3023,7 @@ DEFUN (vnc_nve_group_rt_both, DEFUN (vnc_nve_group_l2rd, vnc_nve_group_l2rd_cmd, - "l2rd (ID|auto:vn)", + "l2rd <(1-255)|auto-vn>", "Specify default Local Nve ID value to use in RD for L2 routes\n" "Fixed value 1-255\n" "use the low-order octet of the NVE's VN address\n") @@ -3168,7 +3170,7 @@ DEFUN (vnc_nve_group_rd, DEFUN (vnc_nve_group_responselifetime, vnc_nve_group_responselifetime_cmd, - "response-lifetime (LIFETIME|infinite)", + "response-lifetime <LIFETIME|infinite>", "Specify response lifetime\n" "Response lifetime in seconds\n" "Infinite response lifetime\n") { @@ -3340,7 +3342,7 @@ DEFUN (vnc_no_l2_group, DEFUN (vnc_l2_group_lni, vnc_l2_group_lni_cmd, - "logical-network-id <0-4294967295>", + "logical-network-id (0-4294967295)", "Specify Logical Network ID associated with group\n" "value\n") { @@ -3362,7 +3364,7 @@ DEFUN (vnc_l2_group_lni, DEFUN (vnc_l2_group_labels, vnc_l2_group_labels_cmd, - "labels .LABELLIST", + "labels LABELLIST...", "Specify label values associated with group\n" "Space separated list of label values <0-1048575>\n") { @@ -3400,7 +3402,7 @@ DEFUN (vnc_l2_group_labels, DEFUN (vnc_l2_group_no_labels, vnc_l2_group_no_labels_cmd, - "no labels .LABELLIST", + "no labels LABELLIST...", NO_STR "Remove label values associated with L2 group\n" "Specify label values associated with L2 group\n" @@ -3439,7 +3441,7 @@ DEFUN (vnc_l2_group_no_labels, DEFUN (vnc_l2_group_rt, vnc_l2_group_rt_cmd, - "rt (both|export|import) ASN:nn_or_IP-address:nn", + "rt <both|export|import> ASN:nn_or_IP-address:nn", "Specify route targets\n" "Export+import filters\n" "Export filters\n" diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 248ba7a63..6d86d48b6 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -3061,13 +3061,15 @@ DEFUN (debug_rfapi_show_nves, DEFUN ( debug_rfapi_show_nves_vn_un, debug_rfapi_show_nves_vn_un_cmd, - "debug rfapi-dev show nves (vn|un) (A.B.C.D|X:X::X:X)", /* prefix also ok */ + "debug rfapi-dev show nves <vn|un> <A.B.C.D|X:X::X:X>", /* prefix also ok */ DEBUG_STR DEBUG_RFAPI_STR SHOW_STR "NVE Information\n" - "Specify virtual network or underlay network interface\n" - "IPv4 or IPv6 address\n") + "Specify virtual network\n" + "Specify underlay network interface\n" + "IPv4 address\n" + "IPv6 address\n") { struct prefix pfx; @@ -3125,13 +3127,16 @@ test_nexthops_callback ( DEFUN (debug_rfapi_open, debug_rfapi_open_cmd, - "debug rfapi-dev open vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X)", + "debug rfapi-dev open vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>", DEBUG_STR DEBUG_RFAPI_STR "rfapi_open\n" "indicate vn addr follows\n" - "virtual network interface address\n" - "indicate xt addr follows\n" "underlay network interface address\n") + "virtual network interface IPv4 address\n" + "virtual network interface IPv6 address\n" + "indicate xt addr follows\n" + "underlay network interface IPv4 address\n" + "underlay network interface IPv6 address\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3167,13 +3172,16 @@ DEFUN (debug_rfapi_open, DEFUN (debug_rfapi_close_vn_un, debug_rfapi_close_vn_un_cmd, - "debug rfapi-dev close vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X)", + "debug rfapi-dev close vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>", DEBUG_STR DEBUG_RFAPI_STR "rfapi_close\n" "indicate vn addr follows\n" - "virtual network interface address\n" - "indicate xt addr follows\n" "underlay network interface address\n") + "virtual network interface IPv4 address\n" + "virtual network interface IPv6 address\n" + "indicate xt addr follows\n" + "underlay network interface IPv4 address\n" + "underlay network interface IPv6 address\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3239,7 +3247,7 @@ DEFUN (debug_rfapi_close_rfd, DEFUN (debug_rfapi_register_vn_un, debug_rfapi_register_vn_un_cmd, - "debug rfapi-dev register vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) prefix (A.B.C.D/M|X:X::X:X/M) lifetime SECONDS", + "debug rfapi-dev register vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> lifetime SECONDS", DEBUG_STR DEBUG_RFAPI_STR "rfapi_register\n" @@ -3251,7 +3259,9 @@ DEFUN (debug_rfapi_register_vn_un, "underlay network IPv6 interface address\n" "indicate prefix follows\n" "IPv4 prefix\n" - "IPv6 prefix\n" "indicate lifetime follows\n" "lifetime\n") + "IPv6 prefix\n" + "indicate lifetime follows\n" + "lifetime\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3319,13 +3329,7 @@ DEFUN (debug_rfapi_register_vn_un, DEFUN (debug_rfapi_register_vn_un_l2o, debug_rfapi_register_vn_un_l2o_cmd, - "debug rfapi-dev register" - " vn (A.B.C.D|X:X::X:X)" - " un (A.B.C.D|X:X::X:X)" - " prefix (A.B.C.D/M|X:X::X:X/M)" - " lifetime SECONDS" - " macaddr YY:YY:YY:YY:YY:YY" - " lni <0-16777215>", + "debug rfapi-dev register vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> lifetime SECONDS macaddr YY:YY:YY:YY:YY:YY lni (0-16777215)", DEBUG_STR DEBUG_RFAPI_STR "rfapi_register\n" @@ -3337,7 +3341,13 @@ DEFUN (debug_rfapi_register_vn_un_l2o, "underlay network IPv6 interface address\n" "indicate prefix follows\n" "IPv4 prefix\n" - "IPv6 prefix\n" "indicate lifetime follows\n" "lifetime\n") + "IPv6 prefix\n" + "indicate lifetime follows\n" + "Seconds of lifetime\n" + "indicate MAC address follows\n" + "MAC address\n" + "indicate lni follows\n" + "lni value range\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3430,7 +3440,7 @@ DEFUN (debug_rfapi_register_vn_un_l2o, DEFUN (debug_rfapi_unregister_vn_un, debug_rfapi_unregister_vn_un_cmd, - "debug rfapi-dev unregister vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) prefix (A.B.C.D/M|X:X::X:X/M)", + "debug rfapi-dev unregister vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M>", DEBUG_STR DEBUG_RFAPI_STR "rfapi_register\n" @@ -3490,15 +3500,19 @@ DEFUN (debug_rfapi_unregister_vn_un, DEFUN (debug_rfapi_query_vn_un, debug_rfapi_query_vn_un_cmd, - "debug rfapi-dev query vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) target (A.B.C.D|X:X::X:X)", + "debug rfapi-dev query vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> target <A.B.C.D|X:X::X:X>", DEBUG_STR DEBUG_RFAPI_STR "rfapi_query\n" "indicate vn addr follows\n" - "virtual network interface address\n" - "indicate xt addr follows\n" - "underlay network interface address\n" - "indicate target follows\n" "target\n") + "virtual network interface IPv4 address\n" + "virtual network interface IPv6 address\n" + "indicate un addr follows\n" + "IPv4 un address\n" + "IPv6 un address\n" + "indicate target follows\n" + "target IPv4 address\n" + "target IPv6 address\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3559,17 +3573,20 @@ DEFUN (debug_rfapi_query_vn_un, DEFUN (debug_rfapi_query_vn_un_l2o, debug_rfapi_query_vn_un_l2o_cmd, - "debug rfapi-dev query vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) lni LNI target YY:YY:YY:YY:YY:YY", + "debug rfapi-dev query vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lni LNI target YY:YY:YY:YY:YY:YY", DEBUG_STR DEBUG_RFAPI_STR "rfapi_query\n" "indicate vn addr follows\n" - "virtual network interface address\n" + "virtual network interface IPv4 address\n" + "virtual network interface IPv6 address\n" "indicate xt addr follows\n" - "underlay network interface address\n" + "underlay network interface IPv4 address\n" + "underlay network interface IPv6 address\n" "logical network ID follows\n" "logical network ID\n" - "indicate target MAC addr follows\n" "target MAC addr\n") + "indicate target MAC addr follows\n" + "target MAC addr\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3666,15 +3683,20 @@ DEFUN (debug_rfapi_query_vn_un_l2o, DEFUN (debug_rfapi_query_done_vn_un, debug_rfapi_query_vn_un_done_cmd, - "debug rfapi-dev query done vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X) target (A.B.C.D|X:X::X:X)", + "debug rfapi-dev query done vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> target <A.B.C.D|X:X::X:X>", DEBUG_STR DEBUG_RFAPI_STR "rfapi_query_done\n" + "rfapi_query_done\n" "indicate vn addr follows\n" - "virtual network interface address\n" + "virtual network interface IPv4 address\n" + "virtual network interface IPv6 address\n" "indicate xt addr follows\n" - "underlay network interface address\n" - "indicate prefix follows\n" "prefix\n") + "underlay network interface IPv4 address\n" + "underlay network interface IPv6 address\n" + "indicate target follows\n" + "Target IPv4 address\n" + "Target IPv6 address\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3810,14 +3832,17 @@ DEFUN (debug_rfapi_show_import, DEFUN (debug_rfapi_show_import_vn_un, debug_rfapi_show_import_vn_un_cmd, - "debug rfapi-dev show import vn (A.B.C.D|X:X::X:X) un (A.B.C.D|X:X::X:X)", + "debug rfapi-dev show import vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>", DEBUG_STR DEBUG_RFAPI_STR SHOW_STR "import\n" "indicate vn addr follows\n" - "virtual network interface address\n" - "indicate xt addr follows\n" "underlay network interface address\n") + "virtual network interface IPv4 address\n" + "virtual network interface IPv6 address\n" + "indicate xt addr follows\n" + "underlay network interface IPv4 address\n" + "underlay network interface IPv6 address\n") { struct rfapi_ip_addr vn; struct rfapi_ip_addr un; @@ -3862,7 +3887,7 @@ DEFUN (debug_rfapi_show_import_vn_un, DEFUN (debug_rfapi_response_omit_self, debug_rfapi_response_omit_self_cmd, - "debug rfapi-dev response-omit-self (on|off)", + "debug rfapi-dev response-omit-self <on|off>", DEBUG_STR DEBUG_RFAPI_STR "Omit self in RFP responses\n" diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 0b729ba30..d96225d40 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -2546,11 +2546,11 @@ register_add ( } /************************************************************************ - * Add prefix With .LNH_OPTIONS + * Add prefix With LNH_OPTIONS... ************************************************************************/ DEFUN (add_vnc_prefix_cost_life_lnh, add_vnc_prefix_cost_life_lnh_cmd, - "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295) .LNH_OPTIONS", + "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295) LNH_OPTIONS...", "Add registration\n" "VNC Information\n" "Add/modify prefix related information\n" @@ -2576,7 +2576,7 @@ DEFUN (add_vnc_prefix_cost_life_lnh, DEFUN (add_vnc_prefix_life_cost_lnh, add_vnc_prefix_life_cost_lnh_cmd, - "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) cost (0-255) .LNH_OPTIONS", + "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) cost (0-255) LNH_OPTIONS...", "Add registration\n" "VNC Information\n" "Add/modify prefix related information\n" @@ -2602,7 +2602,7 @@ DEFUN (add_vnc_prefix_life_cost_lnh, DEFUN (add_vnc_prefix_cost_lnh, add_vnc_prefix_cost_lnh_cmd, - "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) .LNH_OPTIONS", + "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) LNH_OPTIONS...", "Add registration\n" "VNC Information\n" "Add/modify prefix related information\n" @@ -2626,7 +2626,7 @@ DEFUN (add_vnc_prefix_cost_lnh, DEFUN (add_vnc_prefix_life_lnh, add_vnc_prefix_life_lnh_cmd, - "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) .LNH_OPTIONS", + "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) LNH_OPTIONS...", "Add registration\n" "VNC Information\n" "Add/modify prefix related information\n" @@ -2650,7 +2650,7 @@ DEFUN (add_vnc_prefix_life_lnh, DEFUN (add_vnc_prefix_lnh, add_vnc_prefix_lnh_cmd, - "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> .LNH_OPTIONS", + "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> LNH_OPTIONS...", "Add registration\n" "VNC Information\n" "Add/modify prefix related information\n" @@ -2671,7 +2671,7 @@ DEFUN (add_vnc_prefix_lnh, } /************************************************************************ - * Add prefix Without .LNH_OPTIONS + * Add prefix Without LNH_OPTIONS... ************************************************************************/ DEFUN (add_vnc_prefix_cost_life, add_vnc_prefix_cost_life_cmd, @@ -3710,7 +3710,9 @@ DEFUN (clear_vnc_nve_all, clear_vnc_nve_all_cmd, "clear vnc nve *", "clear\n" - "VNC Information\n" "Clear per NVE information\n" "For all NVEs\n") + "VNC Information\n" + "Clear per NVE information\n" + "For all NVEs\n") { struct rfapi_local_reg_delete_arg cda; @@ -3737,10 +3739,13 @@ DEFUN (clear_vnc_nve_vn_un, "VNC Information\n" "Clear prefix registration information\n" "VN address of NVE\n" + "For all NVEs\n" "VN IPv4 interface address\n" "VN IPv6 interface address\n" "UN address of NVE\n" - "UN IPv4 interface address\n" "UN IPv6 interface address\n") + "For all UN addresses\n" + "UN IPv4 interface address\n" + "UN IPv6 interface address\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -3767,10 +3772,13 @@ DEFUN (clear_vnc_nve_un_vn, "VNC Information\n" "Clear prefix registration information\n" "UN address of NVE\n" + "For all un NVEs\n" "UN IPv4 interface address\n" "UN IPv6 interface address\n" "VN address of NVE\n" - "VN IPv4 interface address\n" "VN IPv6 interface address\n") + "For all vn NVEs\n" + "VN IPv4 interface address\n" + "VN IPv6 interface address\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -3797,7 +3805,9 @@ DEFUN (clear_vnc_nve_vn, "VNC Information\n" "Clear prefix registration information\n" "VN address of NVE\n" - "VN IPv4 interface address\n" "VN IPv6 interface address\n") + "All addresses\n" + "VN IPv4 interface address\n" + "VN IPv6 interface address\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -3822,7 +3832,9 @@ DEFUN (clear_vnc_nve_un, "VNC Information\n" "Clear prefix registration information\n" "UN address of NVE\n" - "UN IPv4 interface address\n" "UN IPv6 interface address\n") + "All un nves\n" + "UN IPv4 interface address\n" + "UN IPv6 interface address\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -4158,7 +4170,6 @@ DEFUN (clear_vnc_mac_vn_un_prefix, "VNI keyword\n" "Any virtual network identifier\n" "Virtual network identifier\n" - "Virtual network identifier\n" "VN address of NVE\n" "All VN addresses\n" "VN IPv4 interface address\n" @@ -4204,7 +4215,15 @@ DEFUN (clear_vnc_mac_un_vn_prefix, "VN address of NVE\n" "All VN addresses\n" "VN IPv4 interface address\n" - "VN IPv6 interface address\n") + "VN IPv6 interface address\n" + "Clear prefix registration information\n" + "All prefixes\n" + "IPv4 prefix\n" + "IPv6 prefix\n" + "Clear prefix registration information\n" + "All prefixes\n" + "IPv4 prefix\n" + "IPv6 prefix\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -4234,7 +4253,11 @@ DEFUN (clear_vnc_mac_un_prefix, "UN address of NVE\n" "All UN addresses\n" "UN IPv4 interface address\n" - "UN IPv6 interface address\n") + "UN IPv6 interface address\n" + "Clear prefix registration information\n" + "All prefixes\n" + "IPv4 Prefix\n" + "IPv6 Prefix\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -4264,7 +4287,11 @@ DEFUN (clear_vnc_mac_vn_prefix, "UN address of NVE\n" "All VN addresses\n" "VN IPv4 interface address\n" - "VN IPv6 interface address\n") + "VN IPv6 interface address\n" + "Clear prefix registration information\n" + "All prefixes\n" + "IPv4 Prefix\n" + "IPv6 Prefix\n") { struct rfapi_local_reg_delete_arg cda; int rc; @@ -4652,8 +4679,9 @@ DEFUN (vnc_show_registrations_pfx, SHOW_STR VNC_SHOW_STR "List active prefix registrations\n" - "Limit output to a particular prefix or address\n" - "Limit output to a particular prefix or address\n") + "Limit output to a particular IPv4 prefix\n" + "Limit output to a particular IPv6 prefix\n" + "Limit output to a particular IPv6 address\n") { struct prefix p; struct prefix *p_addr = NULL; @@ -4686,7 +4714,8 @@ DEFUN (vnc_show_registrations_some_pfx, "show only imported prefixes\n" "show only local registrations\n" "show only remote registrations\n" - "Limit output to a particular prefix or address\n[A" + "Limit output to a particular prefix or address\n" + "Limit output to a particular prefix or address\n" "Limit output to a particular prefix or address\n") { struct prefix p; @@ -4743,12 +4772,13 @@ DEFUN (vnc_show_registrations_some_pfx, DEFUN (vnc_show_responses_pfx, vnc_show_responses_pfx_cmd, - "show vnc responses [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]", - SHOW_STR - VNC_SHOW_STR - "List recent query responses\n" - "Limit output to a particular prefix or address\n" - "Limit output to a particular prefix or address\n") + "show vnc responses [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]", + SHOW_STR + VNC_SHOW_STR + "List recent query responses\n" + "Limit output to a particular IPv4 prefix\n" + "Limit output to a particular IPv6 prefix\n" + "Limit output to a particular IPv6 address\n" ) { struct prefix p; struct prefix *p_addr = NULL; @@ -4777,14 +4807,15 @@ DEFUN (vnc_show_responses_pfx, DEFUN (vnc_show_responses_some_pfx, vnc_show_responses_some_pfx_cmd, - "show vnc responses <active|removed> [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]", - SHOW_STR - VNC_SHOW_STR - "List recent query responses\n" - "show only active query responses\n" - "show only removed query responses\n" - "Limit output to a particular prefix or address\n" - "Limit output to a particular prefix or address\n") + "show vnc responses <active|removed> [<A.B.C.D/M|X:X::X:X/M|YY:YY:YY:YY:YY:YY>]", + SHOW_STR + VNC_SHOW_STR + "List recent query responses\n" + "show only active query responses\n" + "show only removed query responses\n" + "Limit output to a particular IPv4 prefix\n" + "Limit output to a particular IPv6 prefix\n" + "Limit output to a particular IPV6 address\n") { struct prefix p; struct prefix *p_addr = NULL; @@ -4838,7 +4869,8 @@ DEFUN (show_vnc_queries_pfx, VNC_SHOW_STR "List active queries\n" "Limit output to a particular IPv4 prefix or address\n" - "Limit output to a particular IPv6 prefix or address\n") + "Limit output to a particular IPv6 prefix\n" + "Limit output to a particualr IPV6 address\n") { struct prefix pfx; struct prefix *p = NULL; diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c index bf7a898f5..b5ff5bbc8 100644 --- a/bgpd/rfapi/vnc_debug.c +++ b/bgpd/rfapi/vnc_debug.c @@ -95,6 +95,7 @@ DEFUN (no_debug_bgp_vnc, "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>", NO_STR DEBUG_STR + "Undebug\n" BGP_STR VNC_STR "rfapi query handling\n" @@ -138,6 +139,7 @@ DEFUN (no_debug_bgp_vnc_all, "<no debug|undebug> all bgp vnc", NO_STR DEBUG_STR + "Undebug command\n" "Disable all VNC debugging\n" BGP_STR VNC_STR) diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c index b7dfe7987..d4100c096 100644 --- a/bgpd/rfp-example/librfp/rfp_example.c +++ b/bgpd/rfp-example/librfp/rfp_example.c @@ -41,7 +41,9 @@ struct rfp_instance_t global_rfi; /* dynamically allocate in full implemen DEFUN (rfp_example_config_value, rfp_example_config_value_cmd, "rfp example-config-value VALUE", - RFP_SHOW_STR "Example value to be configured\n") + RFP_SHOW_STR + "Example value to be configured\n" + "Value to display") { uint32_t value = 0; struct rfp_instance_t *rfi = NULL; diff --git a/lib/distribute.c b/lib/distribute.c index 09f5c8a46..2e76e352c 100644 --- a/lib/distribute.c +++ b/lib/distribute.c @@ -285,6 +285,7 @@ DEFUN (ipv6_distribute_list, "ipv6 distribute-list [prefix] WORD <in|out> [WORD]", "IPv6\n" "Filter networks in routing updates\n" + "Specify a prefix\n" "Access-list name\n" "Filter incoming routing updates\n" "Filter outgoing routing updates\n" diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 6d6c0d364..ce12974d4 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -1104,15 +1104,22 @@ DEFUN (ospf_area_vlink, case 'm': /* message-digest-key */ i++; - vl_config.crypto_key_id = strtol (argv[i]->arg, NULL, 10); - if (vl_config.crypto_key_id < 0) - return CMD_WARNING; - i++; - memset(md5_key, 0, OSPF_AUTH_MD5_SIZE+1); - strncpy (md5_key, argv[i]->arg, OSPF_AUTH_MD5_SIZE); - vl_config.md5_key = md5_key; + if (i < argc) + { + vl_config.crypto_key_id = strtol (argv[i]->arg, NULL, 10); + if (vl_config.crypto_key_id < 0) + return CMD_WARNING; + i++; + if (i < argc) + { + memset(md5_key, 0, OSPF_AUTH_MD5_SIZE+1); + strncpy (md5_key, argv[i]->arg, OSPF_AUTH_MD5_SIZE); + vl_config.md5_key = md5_key; + } + } + else + vl_config.md5_key = NULL; break; - } } @@ -1238,7 +1245,7 @@ DEFUN (no_ospf_area_vlink, /* If we are down here, we are reseting parameters */ /* Deal with other parameters */ - for (i=6; argc; i++) + for (i=6; i < argc; i++) { /* vty_out (vty, "argv[%d] - %s%s", i, argv[i], VTY_NEWLINE); */ diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 819141afe..a9ed3fc3d 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -67,6 +67,7 @@ $ignore{'"address-family vpnv6 unicast"'} = "ignore"; $ignore{'"exit-address-family"'} = "ignore"; $ignore{'"exit-link-params"'} = "ignore"; $ignore{'"vnc defaults"'} = "ignore"; +$ignore{'"vnc l2-group NAME"'} = "ignore"; $ignore{'"vnc nve-group NAME"'} = "ignore"; $ignore{'"exit-vnc"'} = "ignore"; $ignore{'"key chain WORD"'} = "ignore"; |