diff options
Diffstat (limited to 'sys/netinet6/nd6_rtr.c')
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 6a1255538d8..fa2ab04e923 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.112 2015/07/18 15:05:32 mpi Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.113 2015/07/18 15:51:17 mpi Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -49,7 +49,7 @@ #include <net/if_var.h> #include <net/if_types.h> #include <net/route.h> -#include <net/radix.h> +#include <net/rtable.h> #include <netinet/in.h> #include <netinet6/in6_var.h> @@ -72,7 +72,7 @@ void purge_detached(struct ifnet *); void in6_init_address_ltimes(struct nd_prefix *, struct in6_addrlifetime *); -int rt6_deleteroute(struct radix_node *, void *, u_int); +int rt6_deleteroute(struct rtentry *, void *, unsigned int); void nd6_addr_add(void *); @@ -2184,26 +2184,24 @@ in6_init_address_ltimes(struct nd_prefix *new, struct in6_addrlifetime *lt6) void rt6_flush(struct in6_addr *gateway, struct ifnet *ifp) { - struct radix_node_head *rnh = rtable_get(ifp->if_rdomain, AF_INET6); - int s = splsoftnet(); + int s; /* We'll care only link-local addresses */ - if (!IN6_IS_ADDR_LINKLOCAL(gateway)) { - splx(s); + if (!IN6_IS_ADDR_LINKLOCAL(gateway)) return; - } + /* XXX: hack for KAME's link-local address kludge */ gateway->s6_addr16[1] = htons(ifp->if_index); - rnh->rnh_walktree(rnh, rt6_deleteroute, (void *)gateway); + s = splsoftnet(); + rtable_walk(ifp->if_rdomain, AF_INET6, rt6_deleteroute, gateway); splx(s); } int -rt6_deleteroute(struct radix_node *rn, void *arg, u_int id) +rt6_deleteroute(struct rtentry *rt, void *arg, unsigned int id) { struct rt_addrinfo info; - struct rtentry *rt = (struct rtentry *)rn; struct in6_addr *gate = (struct in6_addr *)arg; if (rt->rt_gateway == NULL || rt->rt_gateway->sa_family != AF_INET6) |