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

zebra: fix optional distance on static mrib route

Browse Source 
Unfortunately, the quagga CLI parser doesn't support [<1-255>].  Fix by
working around with an alias.

Replaces the following commits:
- zebra: mrib: [no] ip mroute - require distance.
- zebra: mrib: [no] ip mroute - make distance optional.
(Rewritten as alias)

Cc: Everton Marques <everton.marques@gmail.com>
Cc: Balaji G <balajig81@gmail.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2015-01-22 19:03:53 +01:00 committed by Donald Sharp
parent b78a80d742
commit b8a9691548
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zebra/zebra_vty.c
View File

@ -167,9 +167,9 @@ zebra_static_ipv4 (struct vty *vty, safi_t safi, int add_cmd,
} }
/* Static unicast routes for multicast RPF lookup. */ /* Static unicast routes for multicast RPF lookup. */
DEFUN (ip_mroute, DEFUN (ip_mroute_dist,
ip_mroute_cmd, ip_mroute_dist_cmd,
"ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) [<1-255>]", "ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>",
IP_STR IP_STR
"Configure static unicast route into MRIB for multicast RPF lookup\n" "Configure static unicast route into MRIB for multicast RPF lookup\n"
"IP destination prefix (e.g. 10.0.0.0/8)\n" "IP destination prefix (e.g. 10.0.0.0/8)\n"
@ -177,12 +177,21 @@ DEFUN (ip_mroute,
"Nexthop interface name\n" "Nexthop interface name\n"
"Distance\n") "Distance\n")
{ {
return zebra_static_ipv4 (vty, SAFI_MULTICAST, 1, argv[0], NULL, argv[1], NULL, NULL, argv[2], NULL); return zebra_static_ipv4 (vty, SAFI_MULTICAST, 1, argv[0], NULL, argv[1], NULL, NULL, argc > 2 ? argv[2] : NULL, NULL);
} }
DEFUN (no_ip_mroute, ALIAS (ip_mroute_dist,
no_ip_mroute_cmd, ip_mroute_cmd,
"no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) [<1-255>]", "ip mroute A.B.C.D/M (A.B.C.D|INTERFACE)",
IP_STR
"Configure static unicast route into MRIB for multicast RPF lookup\n"
"IP destination prefix (e.g. 10.0.0.0/8)\n"
"Nexthop address\n"
"Nexthop interface name\n")
DEFUN (no_ip_mroute_dist,
no_ip_mroute_dist_cmd,
"no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>",
IP_STR IP_STR
"Configure static unicast route into MRIB for multicast RPF lookup\n" "Configure static unicast route into MRIB for multicast RPF lookup\n"
"IP destination prefix (e.g. 10.0.0.0/8)\n" "IP destination prefix (e.g. 10.0.0.0/8)\n"
@ -190,9 +199,19 @@ DEFUN (no_ip_mroute,
"Nexthop interface name\n" "Nexthop interface name\n"
"Distance\n") "Distance\n")
{ {
return zebra_static_ipv4 (vty, SAFI_MULTICAST, 0, argv[0], NULL, argv[1], NULL, NULL, argv[2], NULL); return zebra_static_ipv4 (vty, SAFI_MULTICAST, 0, argv[0], NULL, argv[1], NULL, NULL, argc > 2 ? argv[2] : NULL, NULL);
} }
ALIAS (no_ip_mroute_dist,
no_ip_mroute_cmd,
"no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE)",
NO_STR
IP_STR
"Configure static unicast route into MRIB for multicast RPF lookup\n"
"IP destination prefix (e.g. 10.0.0.0/8)\n"
"Nexthop address\n"
"Nexthop interface name\n")
DEFUN (show_ip_rpf, DEFUN (show_ip_rpf,
show_ip_rpf_cmd, show_ip_rpf_cmd,
"show ip rpf", "show ip rpf",
@ -5827,7 +5846,9 @@ zebra_vty_init (void)
install_element (CONFIG_NODE, &allow_external_route_update_cmd); install_element (CONFIG_NODE, &allow_external_route_update_cmd);
install_element (CONFIG_NODE, &no_allow_external_route_update_cmd); install_element (CONFIG_NODE, &no_allow_external_route_update_cmd);
install_element (CONFIG_NODE, &ip_mroute_cmd); install_element (CONFIG_NODE, &ip_mroute_cmd);
install_element (CONFIG_NODE, &ip_mroute_dist_cmd);
install_element (CONFIG_NODE, &no_ip_mroute_cmd); install_element (CONFIG_NODE, &no_ip_mroute_cmd);
install_element (CONFIG_NODE, &no_ip_mroute_dist_cmd);
install_element (CONFIG_NODE, &ip_route_cmd); install_element (CONFIG_NODE, &ip_route_cmd);
install_element (CONFIG_NODE, &ip_route_tag_cmd); install_element (CONFIG_NODE, &ip_route_tag_cmd);
install_element (CONFIG_NODE, &ip_route_flags_cmd); install_element (CONFIG_NODE, &ip_route_flags_cmd);