proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 01:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: fix ambiguous commands

Browse Source 
Some "show [ip] bgp ipv4 encap ..." commands remaining ambiguous.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-02-10 16:56:10 +01:00
parent 0a22b97922
commit dab8cd005f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_vty.c
View File

@ -2841,7 +2841,7 @@ DEFUN (neighbor_peer_group,
DEFUN (no_neighbor, DEFUN (no_neighbor,
no_neighbor_cmd, no_neighbor_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> [remote-as <(1-4294967295)|internal|external>]", "no neighbor <WORD|<A.B.C.D|X:X::X:X> [remote-as <(1-4294967295)|internal|external>]>",
NO_STR NO_STR
NEIGHBOR_STR NEIGHBOR_STR
NEIGHBOR_ADDR_STR2 NEIGHBOR_ADDR_STR2

6
ospf6d/ospf6_asbr.c
View File

@ -1114,7 +1114,7 @@ DEFUN (ospf6_routemap_set_metric_type,
/* delete "set metric-type" */ /* delete "set metric-type" */
DEFUN (ospf6_routemap_no_set_metric_type, DEFUN (ospf6_routemap_no_set_metric_type,
ospf6_routemap_no_set_metric_type_cmd, ospf6_routemap_no_set_metric_type_cmd,
"no set metric-type <type-1|type-2>", "no set metric-type [<type-1|type-2>]",
NO_STR NO_STR
"Set value\n" "Set value\n"
"Type of metric\n" "Type of metric\n"
@ -1122,9 +1122,9 @@ DEFUN (ospf6_routemap_no_set_metric_type,
"OSPF6 external type 2 metric\n") "OSPF6 external type 2 metric\n")
{ {
VTY_DECLVAR_CONTEXT(route_map_index, route_map_index); VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
int idx_external = 3; char *ext = (argc == 4) ? argv[3]->text : NULL;
int ret = route_map_delete_set (route_map_index, int ret = route_map_delete_set (route_map_index,
"metric-type", argv[idx_external]->arg); "metric-type", ext);
return route_map_command_status (vty, ret); return route_map_command_status (vty, ret);
} }

2
pimd/pim_cmd.c
View File

@ -5964,7 +5964,7 @@ ip_msdp_show_sa_sg(struct vty *vty, const char *src, const char *grp, u_char uj)
DEFUN (show_ip_msdp_sa_sg, DEFUN (show_ip_msdp_sa_sg,
show_ip_msdp_sa_sg_cmd, show_ip_msdp_sa_sg_cmd,
"show ip msdp sa [A.B.C.D] [A.B.C.D] [json]", "show ip msdp sa [A.B.C.D [A.B.C.D]] [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
MSDP_STR MSDP_STR

4
zebra/zebra_mpls_vty.c
View File

@ -472,7 +472,7 @@ DEFUN (no_ip_route_tag_distance_label,
DEFUN (no_ip_route_mask_distance_label, DEFUN (no_ip_route_mask_distance_label,
no_ip_route_mask_distance_label_cmd, no_ip_route_mask_distance_label_cmd,
"no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255)", "no ip route A.B.C.D A.B.C.D <A.B.C.D|INTERFACE|null0> (1-255) label WORD",
NO_STR NO_STR
IP_STR IP_STR
"Establish static routes\n" "Establish static routes\n"
@ -486,7 +486,7 @@ DEFUN (no_ip_route_mask_distance_label,
"One or more labels separated by '/'\n") "One or more labels separated by '/'\n")
{ {
return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, NULL, NULL, return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, NULL, NULL,
argv[6]->arg, NULL, NULL); argv[6]->arg, NULL, argv[8]->arg);
} }
DEFUN (no_ip_route_mask_tag_distance_label, DEFUN (no_ip_route_mask_tag_distance_label,