xnu-2050.7.9.tar.gz

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

diff --git a/bsd/net/ether_if_module.c b/bsd/net/ether_if_module.c
index c2607645ab1a2321b31dbdd1d228f5c8f265202c..60b6846d293649ccc3eef179ed97bf0e14e09df8 100644 (file)
--- a/bsd/net/ether_if_module.c
+++ b/bsd/net/ether_if_module.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2011 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -72,6 +72,7 @@
 
 #include <pexpert/pexpert.h>
 
 
 #include <pexpert/pexpert.h>
 

+#define etherbroadcastaddr     fugly

 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_llc.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_llc.h>


@@ -82,6 +83,7 @@
 #include <netinet/in.h>        /* For M_LOOP */
 #include <net/kpi_interface.h>
 #include <net/kpi_protocol.h>
 #include <netinet/in.h>        /* For M_LOOP */
 #include <net/kpi_interface.h>
 #include <net/kpi_protocol.h>

+#undef etherbroadcastaddr

 
 /*
 #if INET
 
 /*
 #if INET


@@ -95,7 +97,12 @@
 #include <net/ether_if_module.h>
 #include <sys/socketvar.h>
 #include <net/if_vlan_var.h>
 #include <net/ether_if_module.h>
 #include <sys/socketvar.h>
 #include <net/if_vlan_var.h>

-#include <net/if_bond_var.h>
+#if BOND
+#include <net/if_bond_internal.h>
+#endif /* BOND */
+#if IF_BRIDGE
+#include <net/if_bridgevar.h>
+#endif /* IF_BRIDGE */

 
 #include <net/dlil.h>
 
 
 #include <net/dlil.h>
 


@@ -111,10 +118,6 @@ extern struct ifqueue atalkintrq;
 #endif
 
 
 #endif
 
 

-#if BRIDGE
-#include <net/bridge.h>
-#endif
-

 #define memcpy(x,y,z)  bcopy(y, x, z)
 
 
 #define memcpy(x,y,z)  bcopy(y, x, z)
 
 


@@ -123,8 +126,8 @@ SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Ethernet
 
 struct en_desc {
        u_int16_t       type;                   /* Type of protocol stored in data */
 
 struct en_desc {
        u_int16_t       type;                   /* Type of protocol stored in data */

-       u_long          protocol_family;        /* Protocol family */
-       u_long          data[2];                /* Protocol data */
+       u_int32_t               protocol_family;        /* Protocol family */
+       u_int32_t               data[2];                /* Protocol data */

 };
 
 /* descriptors are allocated in blocks of ETHER_DESC_BLK_SIZE */
 };
 
 /* descriptors are allocated in blocks of ETHER_DESC_BLK_SIZE */


@@ -135,13 +138,13 @@ struct en_desc {
 #endif
 
 /*
 #endif
 
 /*

- * Header for the demux list, hangs off of IFP at family_cookie
+ * Header for the demux list, hangs off of IFP at if_family_cookie

  */
 
 struct ether_desc_blk_str {
  */
 
 struct ether_desc_blk_str {

-       u_long  n_max_used;
-       u_long  n_count;
-       u_long  n_used;
+       u_int32_t  n_max_used;
+       u_int32_t       n_count;
+       u_int32_t       n_used;

        struct en_desc  block_ptr[1];
 };
 /* Size of the above struct before the array of struct en_desc */
        struct en_desc  block_ptr[1];
 };
 /* Size of the above struct before the array of struct en_desc */


@@ -149,19 +152,6 @@ struct ether_desc_blk_str {
 __private_extern__ u_char      etherbroadcastaddr[ETHER_ADDR_LEN] =
                                                                { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 __private_extern__ u_char      etherbroadcastaddr[ETHER_ADDR_LEN] =
                                                                { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 

-static __inline__ int
-_ether_cmp(const void * a, const void * b)
-{
-       const u_int16_t * a_s = (const u_int16_t *)a;
-       const u_int16_t * b_s = (const u_int16_t *)b;
-       
-       if (a_s[0] != b_s[0]
-           || a_s[1] != b_s[1]
-           || a_s[2] != b_s[2]) {
-               return (1);
-       }
-       return (0);
-}

 
 /*
  * Release all descriptor entries owned by this protocol (there may be several).
 
 /*
  * Release all descriptor entries owned by this protocol (there may be several).


@@ -173,8 +163,8 @@ ether_del_proto(
        ifnet_t ifp,
        protocol_family_t protocol_family)
 {
        ifnet_t ifp,
        protocol_family_t protocol_family)
 {

-       struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->family_cookie;
-       u_long  current = 0;
+       struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->if_family_cookie;
+       u_int32_t       current = 0;

        int found = 0;
        
        if (desc_blk == NULL)
        int found = 0;
        
        if (desc_blk == NULL)


@@ -189,8 +179,8 @@ ether_del_proto(
        }
        
        if (desc_blk->n_used == 0) {
        }
        
        if (desc_blk->n_used == 0) {

-               FREE(ifp->family_cookie, M_IFADDR);
-               ifp->family_cookie = 0;
+               FREE(ifp->if_family_cookie, M_IFADDR);
+               ifp->if_family_cookie = 0;

        }
        else {
                /* Decrement n_max_used */
        }
        else {
                /* Decrement n_max_used */


@@ -209,7 +199,7 @@ ether_add_proto_internal(
        const struct ifnet_demux_desc   *demux)
 {
        struct en_desc *ed;
        const struct ifnet_demux_desc   *demux)
 {
        struct en_desc *ed;

-       struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->family_cookie;
+       struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->if_family_cookie;

        u_int32_t i;
        
        switch (demux->type) {
        u_int32_t i;
        
        switch (demux->type) {


@@ -265,9 +255,9 @@ ether_add_proto_internal(
        // Check for case where all of the descriptor blocks are in use
        if (desc_blk == NULL || desc_blk->n_used == desc_blk->n_count) {
                struct ether_desc_blk_str *tmp;
        // Check for case where all of the descriptor blocks are in use
        if (desc_blk == NULL || desc_blk->n_used == desc_blk->n_count) {
                struct ether_desc_blk_str *tmp;

-               u_long  new_count = ETHER_DESC_BLK_SIZE;
-               u_long  new_size;
-               u_long  old_size = 0;
+               u_int32_t       new_count = ETHER_DESC_BLK_SIZE;
+               u_int32_t       new_size;
+               u_int32_t       old_size = 0;

                
                i = 0;
                
                
                i = 0;
                


@@ -293,7 +283,7 @@ ether_add_proto_internal(
                        FREE(desc_blk, M_IFADDR);
                }
                desc_blk = tmp;
                        FREE(desc_blk, M_IFADDR);
                }
                desc_blk = tmp;

-               ifp->family_cookie = (u_long)desc_blk;
+               ifp->if_family_cookie = (uintptr_t)desc_blk;

                desc_blk->n_count = new_count;
        }
        else {
                desc_blk->n_count = new_count;
        }
        else {


@@ -369,13 +359,13 @@ ether_demux(
        char                            *frame_header,
        protocol_family_t       *protocol_family)
 {
        char                            *frame_header,
        protocol_family_t       *protocol_family)
 {

-       struct ether_header *eh = (struct ether_header *)frame_header;
+       struct ether_header *eh = (struct ether_header *)(void *)frame_header;

        u_short                 ether_type = eh->ether_type;
        u_int16_t               type;
        u_int8_t                *data;
        u_short                 ether_type = eh->ether_type;
        u_int16_t               type;
        u_int8_t                *data;

-       u_long                  i = 0;
-       struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->family_cookie;
-       u_long                  maxd = desc_blk ? desc_blk->n_max_used : 0;
+       u_int32_t                       i = 0;
+       struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->if_family_cookie;
+       u_int32_t                       maxd = desc_blk ? desc_blk->n_max_used : 0;

        struct en_desc  *ed = desc_blk ? desc_blk->block_ptr : NULL;
        u_int32_t               extProto1 = 0;
        u_int32_t               extProto2 = 0;
        struct en_desc  *ed = desc_blk ? desc_blk->block_ptr : NULL;
        u_int32_t               extProto1 = 0;
        u_int32_t               extProto2 = 0;


@@ -388,6 +378,16 @@ ether_demux(
                        m->m_flags |= M_MCAST;
        }
 
                        m->m_flags |= M_MCAST;
        }
 

+       if (m->m_flags & M_HASFCS) {
+                /*
+                 * If the M_HASFCS is set by the driver we want to make sure
+                 * that we strip off the trailing FCS data before handing it
+                 * up the stack.
+                 */
+                m_adj(m, -ETHER_CRC_LEN);
+               m->m_flags &= ~M_HASFCS;
+        }
+

        if (ifp->if_eflags & IFEF_BOND) {
                /* if we're bonded, bond "protocol" gets all the packets */
                *protocol_family = PF_BOND;
        if (ifp->if_eflags & IFEF_BOND) {
                /* if we're bonded, bond "protocol" gets all the packets */
                *protocol_family = PF_BOND;


@@ -418,7 +418,7 @@ ether_demux(
        else if (ether_type == htons(ETHERTYPE_VLAN)) {
                struct ether_vlan_header *      evl;
 
        else if (ether_type == htons(ETHERTYPE_VLAN)) {
                struct ether_vlan_header *      evl;
 

-               evl = (struct ether_vlan_header *)frame_header;
+               evl = (struct ether_vlan_header *)(void *)frame_header;

                if (m->m_len < ETHER_VLAN_ENCAP_LEN
                    || ntohs(evl->evl_proto) == ETHERTYPE_VLAN
                    || EVL_VLANOFTAG(ntohs(evl->evl_tag)) != 0) {
                if (m->m_len < ETHER_VLAN_ENCAP_LEN
                    || ntohs(evl->evl_proto) == ETHERTYPE_VLAN
                    || EVL_VLANOFTAG(ntohs(evl->evl_tag)) != 0) {


@@ -445,13 +445,13 @@ ether_demux(
        */
        
        if (ntohs(ether_type) <= 1500) {
        */
        
        if (ntohs(ether_type) <= 1500) {

-               extProto1 = *(u_int32_t*)data;
+               bcopy(data, &extProto1, sizeof (u_int32_t));

                
                // SAP or SNAP
                if ((extProto1 & htonl(0xFFFFFF00)) == htonl(0xAAAA0300)) {
                        // SNAP
                        type = DLIL_DESC_SNAP;
                
                // SAP or SNAP
                if ((extProto1 & htonl(0xFFFFFF00)) == htonl(0xAAAA0300)) {
                        // SNAP
                        type = DLIL_DESC_SNAP;

-                       extProto2 = *(u_int32_t*)(data + sizeof(u_int32_t));
+                       bcopy(data + sizeof(u_int32_t), &extProto2, sizeof (u_int32_t));

                        extProto1 &= htonl(0x000000FF);
                } else {
                        type = DLIL_DESC_SAP;
                        extProto1 &= htonl(0x000000FF);
                } else {
                        type = DLIL_DESC_SAP;


@@ -506,11 +506,17 @@ ether_demux(
  */
 int
 ether_frameout(
  */
 int
 ether_frameout(

-       struct ifnet                    *ifp,
-       struct mbuf                             **m,
-       const struct sockaddr   *ndest,
-       const char                              *edst,
-       const char                              *ether_type)
+                          struct ifnet                 *ifp,
+                          struct mbuf                          **m,
+                          const struct sockaddr        *ndest,
+                          const char                           *edst,
+                          const char                           *ether_type
+#if KPI_INTERFACE_EMBEDDED
+                          ,
+                          u_int32_t                            *prepend_len,
+                          u_int32_t                            *postpend_len
+#endif /* KPI_INTERFACE_EMBEDDED */
+                          )

 {
        struct ether_header *eh;
        int hlen;       /* link layer header length */
 {
        struct ether_header *eh;
        int hlen;       /* link layer header length */


@@ -532,11 +538,11 @@ ether_frameout(
             if ((*m)->m_flags & M_BCAST) {
                 struct mbuf *n = m_copy(*m, 0, (int)M_COPYALL);
                 if (n != NULL)
             if ((*m)->m_flags & M_BCAST) {
                 struct mbuf *n = m_copy(*m, 0, (int)M_COPYALL);
                 if (n != NULL)

-                    dlil_output(lo_ifp, ndest->sa_family, n, NULL, ndest, 0);
+                    dlil_output(lo_ifp, ndest->sa_family, n, NULL, ndest, 0, NULL);

             }
             else {
                                        if (_ether_cmp(edst, ifnet_lladdr(ifp)) == 0) {
             }
             else {
                                        if (_ether_cmp(edst, ifnet_lladdr(ifp)) == 0) {

-                    dlil_output(lo_ifp, ndest->sa_family, *m, NULL, ndest, 0);
+                    dlil_output(lo_ifp, ndest->sa_family, *m, NULL, ndest, 0, NULL);

                     return EJUSTRETURN;
                 }
             }
                     return EJUSTRETURN;
                 }
             }


@@ -552,7 +558,11 @@ ether_frameout(
            return (EJUSTRETURN);
        }
 
            return (EJUSTRETURN);
        }
 

-
+#if KPI_INTERFACE_EMBEDDED
+       *prepend_len = sizeof (struct ether_header);
+       *postpend_len = 0;
+#endif /* KPI_INTERFACE_EMBEDDED */
+       

        eh = mtod(*m, struct ether_header *);
        (void)memcpy(&eh->ether_type, ether_type,
                sizeof(eh->ether_type));
        eh = mtod(*m, struct ether_header *);
        (void)memcpy(&eh->ether_type, ether_type,
                sizeof(eh->ether_type));


@@ -584,7 +594,8 @@ ether_check_multi(
                        break;
                
                case AF_LINK:
                        break;
                
                case AF_LINK:

-                       e_addr = CONST_LLADDR((const struct sockaddr_dl*)proto_addr); 
+                       e_addr = CONST_LLADDR((const struct sockaddr_dl*)
+                           (uintptr_t)(size_t)proto_addr);

                        if ((e_addr[0] & 0x01) != 0x01)
                                result = EADDRNOTAVAIL;
                        else
                        if ((e_addr[0] & 0x01) != 0x01)
                                result = EADDRNOTAVAIL;
                        else


@@ -634,6 +645,9 @@ __private_extern__ int ether_family_init(void)
 #if BOND
        bond_family_init();
 #endif /* BOND */
 #if BOND
        bond_family_init();
 #endif /* BOND */

+#if IF_BRIDGE
+       bridgeattach(0);
+#endif /* IF_BRIDGE */

 
  done:
 
 
  done: