xnu-4903.221.2.tar.gz

[apple/xnu.git] / bsd / netinet6 / in6_ifattach.c

diff --git a/bsd/netinet6/in6_ifattach.c b/bsd/netinet6/in6_ifattach.c
index 804a77d8e0458ea7d085ba9e055bc0923006aab8..f19872e563c4a2b89dfeb1a5eae2ce8a0c6ef77a 100644 (file)
--- a/bsd/netinet6/in6_ifattach.c
+++ b/bsd/netinet6/in6_ifattach.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2003-2018 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -72,6 +72,7 @@
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/kpi_protocol.h>
+#include <net/if_llatbl.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -710,7 +711,7 @@ in6_ifattach_prelim(struct ifnet *ifp)
         *   (previously, this was a silent error.)
         */
        if ((ifp->if_flags & IFF_MULTICAST) == 0) {
-               nd6log((LOG_INFO, "in6_ifattach: ",
+               nd6log0((LOG_INFO, "in6_ifattach: ",
                    "%s is not multicast capable, IPv6 not enabled\n",
                    if_name(ifp)));
                return (EINVAL);
@@ -732,6 +733,7 @@ skipmcast:
                pbuf = (void **)((intptr_t)base - sizeof(void *));
                *pbuf = ext;
                ifp->if_inet6data = base;
+               IN6_IFEXTRA(ifp)->ii_llt = in6_lltattach(ifp);
                VERIFY(IS_P2ALIGNED(ifp->if_inet6data, sizeof(uint64_t)));
        } else {
                /*
@@ -744,6 +746,7 @@ skipmcast:
                    sizeof(IN6_IFEXTRA(ifp)->icmp6_ifstat));
                bzero(&IN6_IFEXTRA(ifp)->in6_ifstat,
                    sizeof(IN6_IFEXTRA(ifp)->in6_ifstat));
+               /* XXX TBD Purge the layer two table */
                /*
                 * XXX When recycling, nd_ifinfo gets initialized, other
                 * than the lock, inside nd6_ifattach
@@ -751,7 +754,7 @@ skipmcast:
        }
 
        /*
-        * XXX Only initialize NDP ifinfo for the interface
+        * XXX Only initialize IPv6 configuration for the interface
         * if interface has not yet been configured with
         * link local IPv6 address.
         * Could possibly be optimized with an interface flag if need
@@ -759,6 +762,11 @@ skipmcast:
         */
        ia6 = in6ifa_ifpforlinklocal(ifp, 0);
        if (ia6 == NULL) {
+               IN6_IFEXTRA(ifp)->netsig_len = 0;
+               bzero(&IN6_IFEXTRA(ifp)->netsig,
+                   sizeof(IN6_IFEXTRA(ifp)->netsig));
+               bzero(IN6_IFEXTRA(ifp)->nat64_prefixes,
+                   sizeof(IN6_IFEXTRA(ifp)->nat64_prefixes));
                /* initialize NDP variables */
                nd6_ifattach(ifp);
        } else {
@@ -995,11 +1003,14 @@ in6_ifdetach(struct ifnet *ifp)
        struct in6_multi_mship *imm;
        int unlinked;
 
-       lck_mtx_assert(nd6_mutex, LCK_MTX_ASSERT_NOTOWNED);
+       LCK_MTX_ASSERT(nd6_mutex, LCK_MTX_ASSERT_NOTOWNED);
 
        /* remove neighbor management table */
        nd6_purge(ifp);
 
+       if (LLTABLE6(ifp))
+               lltable_free(LLTABLE6(ifp));
+
        /* nuke any of IPv6 addresses we have */
        lck_rw_lock_exclusive(&in6_ifaddr_rwlock);
        ia = in6_ifaddrs;