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

zebra: accept Null0 again in addition to null0

Browse Source 
Restore behavior before commit a830942.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2017-09-04 11:09:35 -03:00
parent 9aabb2ea74
commit 57a58d777f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zebra/zebra_vty.c
View File

@ -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 */
if (flag_str) {
switch (flag_str[0]) {
case 'r':
bh_type = STATIC_BLACKHOLE_REJECT;
break;
case 'n':
bh_type = STATIC_BLACKHOLE_NULL;
break;
case 'b':
bh_type = STATIC_BLACKHOLE_DROP;
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$gate|INTERFACE$ifname}\
|<null0|reject|blackhole>$flag\
|null0$ifname\
|<reject|blackhole>$flag\
>\
[{\
tag (1-4294967295)\
@ -1715,7 +1720,7 @@ static int static_config(struct vty *vty, afi_t afi, safi_t safi,
vty_out(vty, " blackhole");
break;
case STATIC_BLACKHOLE_NULL:
vty_out(vty, " null0");
vty_out(vty, " Null0");
break;
case STATIC_BLACKHOLE_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]\
<\
{X:X::X:X$gate|INTERFACE$ifname}\
|<null0|reject|blackhole>$flag\
|null0$ifname\
|<reject|blackhole>$flag\
>\
[{\
tag (1-4294967295)\