mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 09:22:03 +00:00
zebra: accept Null0 again in addition to null0
Restore behavior before commit a830942
.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
parent
9aabb2ea74
commit
57a58d777f
@ -165,15 +165,19 @@ static int zebra_static_route(struct vty *vty, afi_t afi, safi_t safi,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Null0 static route. */
|
||||||
|
if ((ifname != NULL)
|
||||||
|
&& (strncasecmp(ifname, "Null0", strlen(ifname)) == 0)) {
|
||||||
|
bh_type = STATIC_BLACKHOLE_NULL;
|
||||||
|
ifname = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/* Route flags */
|
/* Route flags */
|
||||||
if (flag_str) {
|
if (flag_str) {
|
||||||
switch (flag_str[0]) {
|
switch (flag_str[0]) {
|
||||||
case 'r':
|
case 'r':
|
||||||
bh_type = STATIC_BLACKHOLE_REJECT;
|
bh_type = STATIC_BLACKHOLE_REJECT;
|
||||||
break;
|
break;
|
||||||
case 'n':
|
|
||||||
bh_type = STATIC_BLACKHOLE_NULL;
|
|
||||||
break;
|
|
||||||
case 'b':
|
case 'b':
|
||||||
bh_type = STATIC_BLACKHOLE_DROP;
|
bh_type = STATIC_BLACKHOLE_DROP;
|
||||||
break;
|
break;
|
||||||
@ -334,7 +338,8 @@ DEFPY(ip_route, ip_route_cmd,
|
|||||||
<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>\
|
||||||
<\
|
<\
|
||||||
{A.B.C.D$gate|INTERFACE$ifname}\
|
{A.B.C.D$gate|INTERFACE$ifname}\
|
||||||
|<null0|reject|blackhole>$flag\
|
|null0$ifname\
|
||||||
|
|<reject|blackhole>$flag\
|
||||||
>\
|
>\
|
||||||
[{\
|
[{\
|
||||||
tag (1-4294967295)\
|
tag (1-4294967295)\
|
||||||
@ -1715,7 +1720,7 @@ static int static_config(struct vty *vty, afi_t afi, safi_t safi,
|
|||||||
vty_out(vty, " blackhole");
|
vty_out(vty, " blackhole");
|
||||||
break;
|
break;
|
||||||
case STATIC_BLACKHOLE_NULL:
|
case STATIC_BLACKHOLE_NULL:
|
||||||
vty_out(vty, " null0");
|
vty_out(vty, " Null0");
|
||||||
break;
|
break;
|
||||||
case STATIC_BLACKHOLE_REJECT:
|
case STATIC_BLACKHOLE_REJECT:
|
||||||
vty_out(vty, " reject");
|
vty_out(vty, " reject");
|
||||||
@ -1772,7 +1777,8 @@ DEFPY(ipv6_route,
|
|||||||
"[no] ipv6 route X:X::X:X/M$prefix [from X:X::X:X/M]\
|
"[no] ipv6 route X:X::X:X/M$prefix [from X:X::X:X/M]\
|
||||||
<\
|
<\
|
||||||
{X:X::X:X$gate|INTERFACE$ifname}\
|
{X:X::X:X$gate|INTERFACE$ifname}\
|
||||||
|<null0|reject|blackhole>$flag\
|
|null0$ifname\
|
||||||
|
|<reject|blackhole>$flag\
|
||||||
>\
|
>\
|
||||||
[{\
|
[{\
|
||||||
tag (1-4294967295)\
|
tag (1-4294967295)\
|
||||||
|
Loading…
Reference in New Issue
Block a user