diff options
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 1 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 3 | ||||
| -rw-r--r-- | bgpd/bgp_vty.c | 24 | ||||
| -rw-r--r-- | isisd/isis_redist.c | 4 | ||||
| -rwxr-xr-x | lib/route_types.pl | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_asbr.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 8 | ||||
| -rw-r--r-- | ripd/rip_zebra.c | 16 | ||||
| -rw-r--r-- | ripngd/ripng_zebra.c | 10 | ||||
| -rw-r--r-- | tests/bgp_capability_test.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_routemap.c | 16 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 8 |
12 files changed, 52 insertions, 48 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index d13de9b9e6..cfdb9f3ce6 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1001,6 +1001,7 @@ DEFUN (show_ip_bgp_vpn_rd, IP_STR BGP_STR BGP_AFI_HELP_STR + "Address Family modifier\n" "Display information for a route distinguisher\n" "VPN Route Distinguisher\n") { diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index ba95fd3cb9..a8217bca1e 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -7865,6 +7865,9 @@ bgp_show_route (struct vty *vty, struct bgp *bgp, const char *ip_str, int prefix_check, enum bgp_path_type pathtype, u_char use_json) { + if (!bgp) + bgp = bgp_get_default (); + return bgp_show_route_in_table (vty, bgp, bgp->rib[afi][safi], ip_str, afi, safi, prd, prefix_check, pathtype, use_json); diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 86606fb8bc..15d26af0b5 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -9333,7 +9333,7 @@ DEFUN (show_ip_bgp_peer_groups, DEFUN (bgp_redistribute_ipv4, bgp_redistribute_ipv4_cmd, - "redistribute <kernel|connected|static|rip|ospf|isis|pim|table>", + "redistribute " FRR_IP_REDIST_STR_BGPD, "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD) { @@ -9353,7 +9353,7 @@ DEFUN (bgp_redistribute_ipv4, DEFUN (bgp_redistribute_ipv4_rmap, bgp_redistribute_ipv4_rmap_cmd, - "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD", + "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9379,7 +9379,7 @@ DEFUN (bgp_redistribute_ipv4_rmap, DEFUN (bgp_redistribute_ipv4_metric, bgp_redistribute_ipv4_metric_cmd, - "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> metric (0-4294967295)", + "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9407,7 +9407,7 @@ DEFUN (bgp_redistribute_ipv4_metric, DEFUN (bgp_redistribute_ipv4_rmap_metric, bgp_redistribute_ipv4_rmap_metric_cmd, - "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD metric (0-4294967295)", + "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9439,7 +9439,7 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric, DEFUN (bgp_redistribute_ipv4_metric_rmap, bgp_redistribute_ipv4_metric_rmap_cmd, - "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> metric (0-4294967295) route-map WORD", + "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9657,7 +9657,7 @@ DEFUN (no_bgp_redistribute_ipv4_ospf, DEFUN (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_cmd, - "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table> [metric (0-4294967295)] [route-map WORD]", + "no redistribute " FRR_IP_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]", NO_STR "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD @@ -9681,7 +9681,7 @@ DEFUN (no_bgp_redistribute_ipv4, DEFUN (bgp_redistribute_ipv6, bgp_redistribute_ipv6_cmd, - "redistribute <kernel|connected|static|ripng|ospf6|isis|table>", + "redistribute " FRR_IP6_REDIST_STR_BGPD, "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD) { @@ -9702,7 +9702,7 @@ DEFUN (bgp_redistribute_ipv6, DEFUN (bgp_redistribute_ipv6_rmap, bgp_redistribute_ipv6_rmap_cmd, - "redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD", + "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9728,7 +9728,7 @@ DEFUN (bgp_redistribute_ipv6_rmap, DEFUN (bgp_redistribute_ipv6_metric, bgp_redistribute_ipv6_metric_cmd, - "redistribute <kernel|connected|static|ripng|ospf6|isis|table> metric (0-4294967295)", + "redistribute " FRR_IP6_REDIST_STR_BGPD " metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9756,7 +9756,7 @@ DEFUN (bgp_redistribute_ipv6_metric, DEFUN (bgp_redistribute_ipv6_rmap_metric, bgp_redistribute_ipv6_rmap_metric_cmd, - "redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD metric (0-4294967295)", + "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9788,7 +9788,7 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric, DEFUN (bgp_redistribute_ipv6_metric_rmap, bgp_redistribute_ipv6_metric_rmap_cmd, - "redistribute <kernel|connected|static|ripng|ospf6|isis|table> metric (0-4294967295) route-map WORD", + "redistribute " FRR_IP6_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9820,7 +9820,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap, DEFUN (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_cmd, - "no redistribute <kernel|connected|static|ripng|ospf6|isis|table> [metric (0-4294967295)] [route-map WORD]", + "no redistribute " FRR_IP6_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]", NO_STR "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c index e368180699..bdf90aaa1e 100644 --- a/isisd/isis_redist.c +++ b/isisd/isis_redist.c @@ -540,7 +540,7 @@ isis_redist_area_finish(struct isis_area *area) DEFUN (isis_redistribute, isis_redistribute_cmd, - "redistribute <ipv4|ipv6> <kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|table> <level-1|level-2> [<metric (0-16777215)|route-map WORD>]", + "redistribute " FRR_REDIST_STR_ISISD " <level-1|level-2> [<metric (0-16777215)|route-map WORD>]", REDIST_STR "Redistribute IPv4 routes\n" "Redistribute IPv6 routes\n" @@ -610,7 +610,7 @@ DEFUN (isis_redistribute, DEFUN (no_isis_redistribute, no_isis_redistribute_cmd, - "no redistribute <ipv4|ipv6> <kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|table> <level-1|level-2>", + "no redistribute " FRR_REDIST_STR_ISISD " <level-1|level-2>", NO_STR REDIST_STR "Redistribute IPv4 routes\n" diff --git a/lib/route_types.pl b/lib/route_types.pl index 62c7417b84..27ca950787 100755 --- a/lib/route_types.pl +++ b/lib/route_types.pl @@ -149,7 +149,7 @@ sub collect { push @names, "any"; push @help, " \"Any of the above protocols\\n\""; } - return ("\"(" . join("|", @names) . ")\"", join(" \\\n", @help)); + return ("\"<" . join("|", @names) . ">\"", join(" \\\n", @help)); } for my $daemon (sort keys %daemons) { diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 74c4802f2e..88cc07e1af 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -686,7 +686,7 @@ ospf6_asbr_redistribute_remove (int type, ifindex_t ifindex, DEFUN (ospf6_redistribute, ospf6_redistribute_cmd, - "redistribute <kernel|connected|static|ripng|isis|bgp|table>", + "redistribute " FRR_REDIST_STR_OSPF6D, "Redistribute\n" FRR_REDIST_HELP_STR_OSPF6D) { @@ -704,7 +704,7 @@ DEFUN (ospf6_redistribute, DEFUN (ospf6_redistribute_routemap, ospf6_redistribute_routemap_cmd, - "redistribute <kernel|connected|static|ripng|isis|bgp|table> route-map WORD", + "redistribute " FRR_REDIST_STR_OSPF6D " route-map WORD", "Redistribute\n" FRR_REDIST_HELP_STR_OSPF6D "Route map reference\n" @@ -727,7 +727,7 @@ DEFUN (ospf6_redistribute_routemap, DEFUN (no_ospf6_redistribute, no_ospf6_redistribute_cmd, - "no redistribute <kernel|connected|static|ripng|isis|bgp|table> [route-map WORD]", + "no redistribute " FRR_REDIST_STR_OSPF6D " [route-map WORD]", NO_STR "Redistribute\n" FRR_REDIST_HELP_STR_OSPF6D diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 2a627f9221..62498f4c82 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -7091,7 +7091,7 @@ DEFUN (no_ip_ospf_area, DEFUN (ospf_redistribute_source, ospf_redistribute_source_cmd, - "redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]", + "redistribute " FRR_REDIST_STR_OSPFD " [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]", REDIST_STR FRR_REDIST_HELP_STR_OSPFD "Metric for redistributed routes\n" @@ -7142,7 +7142,7 @@ DEFUN (ospf_redistribute_source, DEFUN (no_ospf_redistribute_source, no_ospf_redistribute_source_cmd, - "no redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]", + "no redistribute " FRR_REDIST_STR_OSPFD " [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]", NO_STR REDIST_STR FRR_REDIST_HELP_STR_OSPFD @@ -7294,7 +7294,7 @@ DEFUN (no_ospf_redistribute_instance_source, DEFUN (ospf_distribute_list_out, ospf_distribute_list_out_cmd, - "distribute-list WORD out <kernel|connected|static|rip|isis|bgp|pim|table>", + "distribute-list WORD out " FRR_REDIST_STR_OSPFD, "Filter networks in routing updates\n" "Access-list name\n" OUT_STR @@ -7316,7 +7316,7 @@ DEFUN (ospf_distribute_list_out, DEFUN (no_ospf_distribute_list_out, no_ospf_distribute_list_out_cmd, - "no distribute-list WORD out <kernel|connected|static|rip|isis|bgp|pim|table>", + "no distribute-list WORD out " FRR_REDIST_STR_OSPFD, NO_STR "Filter networks in routing updates\n" "Access-list name\n" diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 043f1c631e..7fa3baea7e 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -331,7 +331,7 @@ DEFUN (no_rip_redistribute_rip, DEFUN (rip_redistribute_type, rip_redistribute_type_cmd, - "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>", + "redistribute " FRR_REDIST_STR_RIPD, REDIST_STR FRR_REDIST_HELP_STR_RIPD) { @@ -356,7 +356,7 @@ DEFUN (rip_redistribute_type, DEFUN (no_rip_redistribute_type, no_rip_redistribute_type_cmd, - "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>", + "no redistribute " FRR_REDIST_STR_RIPD, NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD) @@ -383,7 +383,7 @@ DEFUN (no_rip_redistribute_type, DEFUN (rip_redistribute_type_routemap, rip_redistribute_type_routemap_cmd, - "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD", + "redistribute " FRR_REDIST_STR_RIPD " route-map WORD", REDIST_STR FRR_REDIST_HELP_STR_RIPD "Route map reference\n" @@ -410,7 +410,7 @@ DEFUN (rip_redistribute_type_routemap, DEFUN (no_rip_redistribute_type_routemap, no_rip_redistribute_type_routemap_cmd, - "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPD " route-map WORD", NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD @@ -438,7 +438,7 @@ DEFUN (no_rip_redistribute_type_routemap, DEFUN (rip_redistribute_type_metric, rip_redistribute_type_metric_cmd, - "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)", + "redistribute " FRR_REDIST_STR_RIPD " metric (0-16)", REDIST_STR FRR_REDIST_HELP_STR_RIPD "Metric\n" @@ -468,7 +468,7 @@ DEFUN (rip_redistribute_type_metric, DEFUN (no_rip_redistribute_type_metric, no_rip_redistribute_type_metric_cmd, - "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)", + "no redistribute " FRR_REDIST_STR_RIPD " metric (0-16)", NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD @@ -496,7 +496,7 @@ DEFUN (no_rip_redistribute_type_metric, DEFUN (rip_redistribute_type_metric_routemap, rip_redistribute_type_metric_routemap_cmd, - "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD", + "redistribute " FRR_REDIST_STR_RIPD " metric (0-16) route-map WORD", REDIST_STR FRR_REDIST_HELP_STR_RIPD "Metric\n" @@ -531,7 +531,7 @@ DEFUN (rip_redistribute_type_metric_routemap, DEFUN (no_rip_redistribute_type_metric_routemap, no_rip_redistribute_type_metric_routemap_cmd, - "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPD " metric (0-16) route-map WORD", NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index bb8fed3e93..5de785a6b8 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -315,7 +315,7 @@ DEFUN (no_ripng_redistribute_ripng, DEFUN (ripng_redistribute_type, ripng_redistribute_type_cmd, - "redistribute <kernel|connected|static|ospf6|isis|bgp|table>", + "redistribute " FRR_REDIST_STR_RIPNGD, "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD) { @@ -336,7 +336,7 @@ DEFUN (ripng_redistribute_type, DEFUN (no_ripng_redistribute_type, no_ripng_redistribute_type_cmd, - "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> [metric (0-16)] [route-map WORD]", + "no redistribute " FRR_REDIST_STR_RIPNGD " [metric (0-16)] [route-map WORD]", NO_STR "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD @@ -364,7 +364,7 @@ DEFUN (no_ripng_redistribute_type, DEFUN (ripng_redistribute_type_metric, ripng_redistribute_type_metric_cmd, - "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16)", + "redistribute " FRR_REDIST_STR_RIPNGD " metric (0-16)", "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD "Metric\n" @@ -392,7 +392,7 @@ DEFUN (ripng_redistribute_type_metric, DEFUN (ripng_redistribute_type_routemap, ripng_redistribute_type_routemap_cmd, - "redistribute <kernel|connected|static|ospf6|isis|bgp|table> route-map WORD", + "redistribute " FRR_REDIST_STR_RIPNGD " route-map WORD", "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" @@ -418,7 +418,7 @@ DEFUN (ripng_redistribute_type_routemap, DEFUN (ripng_redistribute_type_metric_routemap, ripng_redistribute_type_metric_routemap_cmd, - "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16) route-map WORD", + "redistribute " FRR_REDIST_STR_RIPNGD " metric (0-16) route-map WORD", "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD "Metric\n" diff --git a/tests/bgp_capability_test.c b/tests/bgp_capability_test.c index 3ee6a121e4..f83dee5e1c 100644 --- a/tests/bgp_capability_test.c +++ b/tests/bgp_capability_test.c @@ -589,7 +589,7 @@ parse_test (struct peer *peer, struct test_segment *t, int type) safi_t safi; /* Convert AFI, SAFI to internal values, check. */ - if (bgp_map_afi_safi_iana2int (t->afi, t->safi, &afi, &safi)) + if (bgp_map_afi_safi_iana2int (afi_int2iana(t->afi), t->safi, &afi, &safi)) { if (t->afi_valid == VALID_AFI) failed++; diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index f8f3c4318d..5fe4a7ab9d 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -443,7 +443,7 @@ DEFUN (no_zebra_route_map_timer, DEFUN (ip_protocol, ip_protocol_cmd, - "ip protocol <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> route-map ROUTE-MAP", + "ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter routing info exchanged between zebra and protocol\n" FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -482,7 +482,7 @@ DEFUN (ip_protocol, DEFUN (no_ip_protocol, no_ip_protocol_cmd, - "no ip protocol <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> [route-map ROUTE-MAP]", + "no ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP_STR "Stop filtering routing info between zebra and protocol\n" @@ -552,7 +552,7 @@ DEFUN (show_ip_protocol, DEFUN (ipv6_protocol, ipv6_protocol_cmd, - "ipv6 protocol <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> route-map ROUTE-MAP", + "ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP6_STR "Filter IPv6 routing info exchanged between zebra and protocol\n" FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -591,7 +591,7 @@ DEFUN (ipv6_protocol, DEFUN (no_ipv6_protocol, no_ipv6_protocol_cmd, - "no ipv6 protocol <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> [route-map ROUTE-MAP]", + "no ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP6_STR "Stop filtering IPv6 routing info between zebra and protocol\n" @@ -660,7 +660,7 @@ DEFUN (show_ipv6_protocol, DEFUN (ip_protocol_nht_rmap, ip_protocol_nht_rmap_cmd, - "ip nht <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> route-map ROUTE-MAP", + "ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter Next Hop tracking route resolution\n" FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -696,7 +696,7 @@ DEFUN (ip_protocol_nht_rmap, DEFUN (no_ip_protocol_nht_rmap, no_ip_protocol_nht_rmap_cmd, - "no ip nht <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> [route-map ROUTE-MAP]", + "no ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP_STR "Filter Next Hop tracking route resolution\n" @@ -760,7 +760,7 @@ DEFUN (show_ip_protocol_nht, DEFUN (ipv6_protocol_nht_rmap, ipv6_protocol_nht_rmap_cmd, - "ipv6 nht <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> route-map ROUTE-MAP", + "ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP6_STR "Filter Next Hop tracking route resolution\n" FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -790,7 +790,7 @@ DEFUN (ipv6_protocol_nht_rmap, DEFUN (no_ipv6_protocol_nht_rmap, no_ipv6_protocol_nht_rmap_cmd, - "no ipv6 nht <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> [route-map ROUTE-MAP]", + "no ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP6_STR "Filter Next Hop tracking route resolution\n" diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 113b063913..f075677575 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1468,7 +1468,7 @@ DEFUN (show_ip_route_supernets, DEFUN (show_ip_route_protocol, show_ip_route_protocol_cmd, - "show ip route [vrf NAME] <kernel|connected|static|rip|ospf|isis|bgp|pim|table>", + "show ip route [vrf NAME] " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" @@ -2064,7 +2064,7 @@ DEFUN (show_ip_route_vrf_all_supernets, DEFUN (show_ip_route_vrf_all_protocol, show_ip_route_vrf_all_protocol_cmd, - "show ip route vrf all <kernel|connected|static|rip|ospf|isis|bgp|pim|table>", + "show ip route vrf all " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" @@ -2958,7 +2958,7 @@ DEFUN (show_ipv6_route_prefix_longer, DEFUN (show_ipv6_route_protocol, show_ipv6_route_protocol_cmd, - "show ipv6 route [vrf NAME] <kernel|connected|static|ripng|ospf6|isis|bgp|table>", + "show ipv6 route [vrf NAME] " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" @@ -3354,7 +3354,7 @@ DEFUN (show_ipv6_route_vrf_all_prefix_longer, DEFUN (show_ipv6_route_vrf_all_protocol, show_ipv6_route_vrf_all_protocol_cmd, - "show ipv6 route vrf all <kernel|connected|static|ripng|ospf6|isis|bgp|table>", + "show ipv6 route vrf all " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" |