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

zebra: allow blackhole routes from the kernel to be deleted

Browse Source 
Fixes the following bug:
% ip -6 route add unreachable 4000::/64
% ip -6 route del unreachable 4000::/64
% vtysh -c "show ipv6 route"
[snip]
K>* 4000::/64 [0/1024] unreachable (ICMP unreachable)

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2017-08-31 21:13:23 -03:00
parent a3d18ce6b0
commit 8ba5bd58aa
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zebra/rt_netlink.c
View File

@ -491,17 +491,26 @@ static int netlink_route_change_read_unicast(struct sockaddr_nl *snl,
size_t sz = (afi == AFI_IP) ? 4 : 16; size_t sz = (afi == AFI_IP) ? 4 : 16;
memset(&nh, 0, sizeof(nh)); memset(&nh, 0, sizeof(nh));
if (index && !gate) if (bh_type == BLACKHOLE_UNSPEC) {
nh.type = NEXTHOP_TYPE_IFINDEX; if (index && !gate)
else if (index && gate) nh.type = NEXTHOP_TYPE_IFINDEX;
nh.type = (afi == AFI_IP) else if (index && gate)
? NEXTHOP_TYPE_IPV4_IFINDEX nh.type =
: NEXTHOP_TYPE_IPV6_IFINDEX; (afi == AFI_IP)
else if (!index && gate) ? NEXTHOP_TYPE_IPV4_IFINDEX
nh.type = (afi == AFI_IP) ? NEXTHOP_TYPE_IPV4 : NEXTHOP_TYPE_IPV6_IFINDEX;
else if (!index && gate)
nh.type = (afi == AFI_IP)
? NEXTHOP_TYPE_IPV4
: NEXTHOP_TYPE_IPV6; : NEXTHOP_TYPE_IPV6;
else else {
nh.type = NEXTHOP_TYPE_BLACKHOLE;
nh.bh_type = BLACKHOLE_UNSPEC;
}
} else {
nh.type = NEXTHOP_TYPE_BLACKHOLE; nh.type = NEXTHOP_TYPE_BLACKHOLE;
nh.bh_type = bh_type;
}
nh.ifindex = index; nh.ifindex = index;
if (gate) if (gate)
memcpy(&nh.gate, gate, sz); memcpy(&nh.gate, gate, sz);