diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-05-20 03:03:39 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-05-20 03:03:39 +0200 |
| commit | c3c0ac8395502d7e84e94e0281cb72fa37a236c4 (patch) | |
| tree | 7975560428f010d143f48ad83f7b1099fa471d39 /zebra | |
| parent | Increase SO_SNDBUF and SO_RCVBUF to 8MB to avoid drops in large networks. (diff) | |
| download | frr-c3c0ac8395502d7e84e94e0281cb72fa37a236c4.tar.xz frr-c3c0ac8395502d7e84e94e0281cb72fa37a236c4.zip | |
ospf6d: ospfv3-abr-ecmp-support.patch
OSPFv3: Add ABR support and make ECMP > 4.
Signed-off-by: Dinesh G Dutt <ddutt at cumulusnetworks.com>
Signed-off-by: Pradosh Mohapatra <pmohapat at cumulusnetworks.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/rt_netlink.c | 12 | ||||
| -rw-r--r-- | zebra/zserv.c | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 7c6b3782a..5e8eb7b9f 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1420,6 +1420,10 @@ netlink_route (int cmd, int family, void *dest, int length, void *gate, req.r.rtm_type = RTN_UNREACHABLE; else assert (RTN_BLACKHOLE != RTN_UNREACHABLE); /* false */ + + if (IS_ZEBRA_DEBUG_KERNEL) + zlog_debug ("%s: Adding discard route for family %s\n", + __FUNCTION__, family == AF_INET ? "IPv4" : "IPv6"); } else req.r.rtm_type = RTN_UNICAST; @@ -1912,13 +1916,17 @@ kernel_delete_ipv4 (struct prefix *p, struct rib *rib) int kernel_add_ipv6 (struct prefix *p, struct rib *rib) { - return netlink_route_multipath (RTM_NEWROUTE, p, rib, AF_INET6); + { + return netlink_route_multipath (RTM_NEWROUTE, p, rib, AF_INET6); + } } int kernel_delete_ipv6 (struct prefix *p, struct rib *rib) { - return netlink_route_multipath (RTM_DELROUTE, p, rib, AF_INET6); + { + return netlink_route_multipath (RTM_DELROUTE, p, rib, AF_INET6); + } } /* Delete IPv6 route from the kernel. */ diff --git a/zebra/zserv.c b/zebra/zserv.c index 3c850e425..d745a43d5 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1298,6 +1298,9 @@ zread_ipv6_add (struct zserv *client, u_short length) ifindices[if_count++] = stream_getl (s); } break; + case ZEBRA_NEXTHOP_BLACKHOLE: + nexthop_blackhole_add (rib); + break; } } |