diff options
| author |   mpi <mpi@openbsd.org> | 2017-03-06 08:59:07 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-03-06 08:59:07 +0000 |
| commit | bd26fa18720ae4804bc0ee6845038cc0af3d0408 (patch) | |
| tree | 72046e9d5694e602afb37e3c7ea844f8f6a068f4 /sys/netinet6 | |
| parent | Prefix functions dealing with routing messages with 'rtm_' and keep (diff) | |
| download | wireguard-openbsd-bd26fa18720ae4804bc0ee6845038cc0af3d0408.tar.xz wireguard-openbsd-bd26fa18720ae4804bc0ee6845038cc0af3d0408.zip | |
Kill global list of IPv6 addresses.
ok bluhm@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/in6_var.h | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index eee64de70a4..8e97cf848d3 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.199 2017/02/16 10:15:12 mpi Exp $ */ +/* $OpenBSD: in6.c,v 1.200 2017/03/06 08:59:07 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -614,7 +614,6 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra, ia6->ia_ifa.ifa_netmask = sin6tosa(&ia6->ia_prefixmask); ia6->ia_ifp = ifp; - TAILQ_INSERT_TAIL(&in6_ifaddr, ia6, ia_list); ia6->ia_addr = ifra->ifra_addr; ifa_add(ifp, &ia6->ia_ifa); } @@ -897,8 +896,6 @@ in6_unlink_ifa(struct in6_ifaddr *ia6, struct ifnet *ifp) splsoftassert(IPL_SOFTNET); - TAILQ_REMOVE(&in6_ifaddr, ia6, ia_list); - /* Release the reference to the base prefix. */ if (ia6->ia6_ndpr == NULL) { plen = in6_mask2len(&ia6->ia_prefixmask.sin6_addr, NULL); diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index c6d6d1ef061..a193e2df396 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.65 2017/02/09 15:23:35 jca Exp $ */ +/* $OpenBSD: in6_var.h,v 1.66 2017/03/06 08:59:07 mpi Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -332,9 +332,6 @@ struct in6_aliasreq { #define IN6_ARE_SCOPE_CMP(a,b) ((a)-(b)) #define IN6_ARE_SCOPE_EQUAL(a,b) ((a)==(b)) -TAILQ_HEAD(in6_ifaddrhead, in6_ifaddr); -extern struct in6_ifaddrhead in6_ifaddr; - /* * Multi-cast membership entry. One for each group/ifp that a PCB * belongs to. diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index c77858f7b35..ac84ed1f413 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.180 2017/02/28 09:59:34 mpi Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.181 2017/03/06 08:59:07 mpi Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -114,7 +114,6 @@ #include <netinet/ip_carp.h> #endif -struct in6_ifaddrhead in6_ifaddr; struct niqueue ip6intrq = NIQUEUE_INITIALIZER(IFQ_MAXLEN, NETISR_IPV6); struct cpumem *ip6counters; @@ -152,7 +151,6 @@ ip6_init(void) pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW && pr->pr_protocol < IPPROTO_MAX) ip6_protox[pr->pr_protocol] = pr - inet6sw; - TAILQ_INIT(&in6_ifaddr); ip6_randomid_init(); nd6_init(); frag6_init(); |