diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-31 01:38:22 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-09-01 01:36:06 +0200 |
| commit | af760ec192d93ece48a1c7b4e5bc4ed4a78507e1 (patch) | |
| tree | fe1a3e7c0dffa4a5be66a4745a86f2adca7df74d /zebra | |
| parent | Merge pull request #1076 from donaldsharp/connected (diff) | |
| download | frr-af760ec192d93ece48a1c7b4e5bc4ed4a78507e1.tar.xz frr-af760ec192d93ece48a1c7b4e5bc4ed4a78507e1.zip | |
zebra: Allow bh_type to override nexthop selection
If we've set the bh_type to something besides BLACKHOLE_UNSPEC
due to the received route type being RTN_BLACKHOLE,
RTN_UNREACHABLE or RTN_PROHIBIT then just trust that
the nexthop is just what it is and set accordingly.
Fixes: #1082
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/rt_netlink.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 2f03982e4..6c45df8ca 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -384,16 +384,23 @@ static int netlink_route_change_read_unicast(struct sockaddr_nl *snl, size_t sz = (afi == AFI_IP) ? 4 : 16; memset(&nh, 0, sizeof(nh)); - if (index && !gate) - nh.type = NEXTHOP_TYPE_IFINDEX; - else if (index && gate) - nh.type = (afi == AFI_IP) - ? NEXTHOP_TYPE_IPV4_IFINDEX - : NEXTHOP_TYPE_IPV6_IFINDEX; - else if (!index && gate) - nh.type = (afi == AFI_IP) ? NEXTHOP_TYPE_IPV4 - : NEXTHOP_TYPE_IPV6; - else { + + if (bh_type == BLACKHOLE_UNSPEC) { + if (index && !gate) + nh.type = NEXTHOP_TYPE_IFINDEX; + else if (index && gate) + nh.type = (afi == AFI_IP) ? + ? NEXTHOP_TYPE_IPV4_IFINDEX + : NEXTHOP_TYPE_IPV6_IFINDEX; + else if (!index && gate) + nh.type = (afi == AFI_IP) ? + ? NEXTHOP_TYPE_IPV4 + : NEXTHOP_TYPE_IPV6; + else { + nh.type = NEXTHOP_TYPE_BLACKHOLE; + nh.bh_type = bh_type; + } + } else { nh.type = NEXTHOP_TYPE_BLACKHOLE; nh.bh_type = bh_type; } |