xnu-4903.241.1.tar.gz

[apple/xnu.git] / bsd / net / ether_inet6_pr_module.c

diff --git a/bsd/net/ether_inet6_pr_module.c b/bsd/net/ether_inet6_pr_module.c
index e8411dec64657da761378d4e04e720506fc9f86f..ee014a3dd8283e0a8054bc7fee71b784fb77f63f 100644 (file)
--- a/bsd/net/ether_inet6_pr_module.c
+++ b/bsd/net/ether_inet6_pr_module.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2011 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -68,8 +68,8 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/socketvar.h>
-#include <kern/lock.h>
 
+#include <net/dlil.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_llc.h>
@@ -88,10 +88,7 @@
 #if INET6
 #include <netinet6/nd6.h>
 #include <netinet6/in6_ifattach.h>
-#endif
-
-#if LLC && CCITT
-extern struct ifqueue pkintrq;
+#include <netinet6/ip6_var.h>
 #endif
 
 /* #include "vlan.h" */
@@ -101,6 +98,9 @@ extern struct ifqueue pkintrq;
 
 #include <net/ether_if_module.h>
 
+static const u_char etherip6allnodes[ETHER_ADDR_LEN] =
+       { 0x33, 0x33, 0, 0, 0, 1 };
+
 /*
  * Process a received Ethernet packet;
  * the packet is in the mbuf chain m without
@@ -111,9 +111,12 @@ ether_inet6_input(ifnet_t ifp, protocol_family_t protocol,
     mbuf_t packet, char *header)
 {
 #pragma unused(ifp, protocol)
-       struct ether_header *eh = (struct ether_header *)header;
+       struct ether_header *eh = (struct ether_header *)(void *)header;
+       u_int16_t ether_type;
+
+       bcopy(&eh->ether_type, &ether_type, sizeof (ether_type));
 
-       if (eh->ether_type == htons(ETHERTYPE_IPV6)) {
+       if (ether_type == htons(ETHERTYPE_IPV6)) {
                struct ifnet *mifp;
                /*
                 * Trust the ifp in the mbuf, rather than ifproto's
@@ -131,6 +134,18 @@ ether_inet6_input(ifnet_t ifp, protocol_family_t protocol,
                            ETHER_ADDR_LEN);
                }
 
+               /* Save the Ethernet source address for all-nodes multicasts */
+               if (!bcmp(eh->ether_dhost, etherip6allnodes, ETHER_ADDR_LEN)) {
+                       struct ip6aux *ip6a;
+
+                       ip6a = ip6_addaux(packet);
+                       if (ip6a) {
+                               ip6a->ip6a_flags |= IP6A_HASEEN;
+                               bcopy(eh->ether_shost, ip6a->ip6a_ehsrc,
+                                   ETHER_ADDR_LEN);
+                       }
+               }
+
                if (proto_input(protocol, packet) != 0)
                        m_freem(packet);
        } else {
@@ -155,11 +170,13 @@ ether_inet6_pre_output(ifnet_t ifp, protocol_family_t protocol_family,
         */
        m->m_flags |= M_LOOP;
 
-       result = nd6_lookup_ipv6(ifp, (const struct sockaddr_in6 *)dst_netaddr,
-           &sdl, sizeof (sdl), route, *m0);
+       result = nd6_lookup_ipv6(ifp, (const struct sockaddr_in6 *)
+           (uintptr_t)(size_t)dst_netaddr, &sdl, sizeof (sdl), route, *m0);
 
        if (result == 0) {
-               *(u_int16_t *)type = htons(ETHERTYPE_IPV6);
+               u_int16_t ethertype_ipv6 = htons(ETHERTYPE_IPV6);
+
+               bcopy(&ethertype_ipv6, type, sizeof (ethertype_ipv6));
                bcopy(LLADDR(&sdl), edst, sdl.sdl_alen);
        }
 
@@ -173,7 +190,7 @@ ether_inet6_resolve_multi(ifnet_t ifp, const struct sockaddr *proto_addr,
        static const size_t minsize =
            offsetof(struct sockaddr_dl, sdl_data[0]) + ETHER_ADDR_LEN;
        const struct sockaddr_in6 *sin6 =
-           (const struct sockaddr_in6 *)proto_addr;
+           (const struct sockaddr_in6 *)(uintptr_t)(size_t)proto_addr;
 
        if (proto_addr->sa_family != AF_INET6)
                return (EAFNOSUPPORT);
@@ -202,21 +219,27 @@ ether_inet6_prmod_ioctl(ifnet_t ifp, protocol_family_t protocol_family,
     u_long command, void *data)
 {
 #pragma unused(protocol_family)
-       struct ifreq *ifr = (struct ifreq *)data;
        int error = 0;
 
        switch (command) {
-       case SIOCSIFADDR:
+       case SIOCSIFADDR:               /* struct ifaddr pointer */
+               /*
+                * Note: caller of ifnet_ioctl() passes in pointer to
+                * struct ifaddr as parameter to SIOCSIFADDR, for legacy
+                * reasons.
+                */
                if ((ifp->if_flags & IFF_RUNNING) == 0) {
                        ifnet_set_flags(ifp, IFF_UP, IFF_UP);
                        ifnet_ioctl(ifp, 0, SIOCSIFFLAGS, NULL);
                }
                break;
 
-       case SIOCGIFADDR:
-               (void) ifnet_lladdr_copy_bytes(ifp, ifr->ifr_addr.sa_data,
-                   ETHER_ADDR_LEN);
+       case SIOCGIFADDR: {             /* struct ifreq */
+               struct ifreq *ifr = (struct ifreq *)(void *)data;
+               (void) ifnet_guarded_lladdr_copy_bytes(ifp,
+                   ifr->ifr_addr.sa_data, ETHER_ADDR_LEN);
                break;
+       }
 
        default:
                error = EOPNOTSUPP;
@@ -246,8 +269,8 @@ ether_attach_inet6(struct ifnet *ifp, protocol_family_t protocol_family)
        proto.resolve = ether_inet6_resolve_multi;
        error = ifnet_attach_protocol(ifp, protocol_family, &proto);
        if (error && error != EEXIST) {
-               printf("WARNING: %s can't attach ipv6 to %s%d\n", __func__,
-                   ifp->if_name, ifp->if_unit);
+               printf("WARNING: %s can't attach ipv6 to %s\n", __func__,
+                   if_name(ifp));
        }
 
        return (error);