matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: add back support for nUlL0

Browse source 
Re-add support for typos when specifying a null route.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-11-22 15:45:41 -05:00
parent fcaae8e4ec
commit 10c61d28bf
No known key found for this signature in database
GPG key ID: DAF48E0F57E0834F
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
zebra/zebra_vty.c
View file

@ -351,7 +351,7 @@ DEFPY(ip_route_blackhole,
ip_route_blackhole_cmd, ip_route_blackhole_cmd,
"[no] ip route\ "[no] ip route\
<A.B.C.D/M$prefix|A.B.C.D$prefix A.B.C.D$mask> \ <A.B.C.D/M$prefix|A.B.C.D$prefix A.B.C.D$mask> \
<Null0|reject|blackhole>$flag \ <reject|blackhole>$flag \
[{ \ [{ \
tag (1-4294967295) \ tag (1-4294967295) \
|(1-255)$distance \ |(1-255)$distance \
@ -363,7 +363,6 @@ DEFPY(ip_route_blackhole,
"IP destination prefix (e.g. 10.0.0.0/8)\n" "IP destination prefix (e.g. 10.0.0.0/8)\n"
"IP destination prefix\n" "IP destination prefix\n"
"IP destination prefix mask\n" "IP destination prefix mask\n"
"Null interface\n"
"Emit an ICMP unreachable when matched\n" "Emit an ICMP unreachable when matched\n"
"Silently discard pkts when matched\n" "Silently discard pkts when matched\n"
"Set tag for this route\n" "Set tag for this route\n"
@ -395,15 +394,21 @@ DEFPY(ip_route_address_interface,
"IP destination prefix\n" "IP destination prefix\n"
"IP destination prefix mask\n" "IP destination prefix mask\n"
"IP gateway address\n" "IP gateway address\n"
"IP gateway interface name\n" "IP gateway interface name. Specify 'Null0' (case-insensitive) for a \
null route.\n"
"Set tag for this route\n" "Set tag for this route\n"
"Tag value\n" "Tag value\n"
"Distance value for this route\n" "Distance value for this route\n"
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
MPLS_LABEL_HELPSTR) MPLS_LABEL_HELPSTR)
{ {
const char *flag = NULL;
if (ifname && !strncasecmp(ifname, "Null0", 5)) {
flag = "Null0";
ifname = NULL;
}
return zebra_static_route(vty, AFI_IP, SAFI_UNICAST, no, prefix, return zebra_static_route(vty, AFI_IP, SAFI_UNICAST, no, prefix,
mask_str, NULL, gate_str, ifname, NULL, mask_str, NULL, gate_str, ifname, flag,
tag_str, distance_str, vrf, label); tag_str, distance_str, vrf, label);
} }
@ -431,8 +436,13 @@ DEFPY(ip_route,
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
MPLS_LABEL_HELPSTR) MPLS_LABEL_HELPSTR)
{ {
const char *flag = NULL;
if (ifname && !strncasecmp(ifname, "Null0", 5)) {
flag = "Null0";
ifname = NULL;
}
return zebra_static_route(vty, AFI_IP, SAFI_UNICAST, no, prefix, return zebra_static_route(vty, AFI_IP, SAFI_UNICAST, no, prefix,
mask_str, NULL, gate_str, ifname, NULL, mask_str, NULL, gate_str, ifname, flag,
tag_str, distance_str, vrf, label); tag_str, distance_str, vrf, label);
} }