Changeset 58093 in vbox for trunk

Timestamp:

Oct 7, 2015 1:54:00 PM (9 years ago)

Author:

vboxsync

Message:

VBoxNetAdp/darwin: use ether_add_proto/ether_del_proto. We must use
them so that when we call ether_demux it does the right thing for
registered protocols.

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• VBoxNetAdpInternal.h (modified) (1 diff)
• darwin/VBoxNetAdp-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -102 +102 @@
             /** MAC address. */
             RTMAC             Mac;
-            /** Protocol families attached to this adapter. */
-            protocol_family_t aAttachedFamilies[VBOXNETADP_MAX_FAMILIES];
             /** @} */
 # elif defined(RT_OS_LINUX)

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -156 +156 @@
     mbuf_freem_list(pMBuf);
     return 0;
-}
-
-static void vboxNetAdpDarwinAttachFamily(PVBOXNETADP pThis, protocol_family_t Family)
-{
-    u_int32_t i;
-    for (i = 0; i < VBOXNETADP_MAX_FAMILIES; i++)
-        if (pThis->u.s.aAttachedFamilies[i] == 0)
-        {
-            pThis->u.s.aAttachedFamilies[i] = Family;
-            break;
-        }
-}
-
-static void vboxNetAdpDarwinDetachFamily(PVBOXNETADP pThis, protocol_family_t Family)
-{
-    u_int32_t i;
-    for (i = 0; i < VBOXNETADP_MAX_FAMILIES; i++)
-        if (pThis->u.s.aAttachedFamilies[i] == Family)
-            pThis->u.s.aAttachedFamilies[i] = 0;
-}
-
-static errno_t vboxNetAdpDarwinAddProto(ifnet_t pIface, protocol_family_t Family, const struct ifnet_demux_desc *pDemuxDesc, u_int32_t nDesc)
-{
-    PVBOXNETADP pThis = VBOXNETADP_FROM_IFACE(pIface);
-    Assert(pThis);
-    vboxNetAdpDarwinAttachFamily(pThis, Family);
-    LogFlow(("vboxNetAdpAddProto: Family=%d.\n", Family));
-    return ether_add_proto(pIface, Family, pDemuxDesc, nDesc);
-}
-
-static errno_t vboxNetAdpDarwinDelProto(ifnet_t pIface, protocol_family_t Family)
-{
-    PVBOXNETADP pThis = VBOXNETADP_FROM_IFACE(pIface);
-    Assert(pThis);
-    LogFlow(("vboxNetAdpDelProto: Family=%d.\n", Family));
-    vboxNetAdpDarwinDetachFamily(pThis, Family);
-    return ether_del_proto(pIface, Family);
 }
 
@@ -295 +258 @@
     Params.output = vboxNetAdpDarwinOutput;
     Params.demux = vboxNetAdpDarwinDemux;
-    Params.add_proto = vboxNetAdpDarwinAddProto;
-    Params.del_proto = vboxNetAdpDarwinDelProto;
+    Params.add_proto = ether_add_proto;
+    Params.del_proto = ether_del_proto;
     Params.check_multi = ether_check_multi;
     Params.framer = ether_frameout;
@@ -353 +316 @@
         Log(("vboxNetAdpDarwinUnregisterDevice: Failed to bring down interface "
              "(err=%d).\n", err));
-    /* Detach all protocols. */
-    for (i = 0; i < VBOXNETADP_MAX_FAMILIES; i++)
-        if (pThis->u.s.aAttachedFamilies[i])
-            ifnet_detach_protocol(pThis->u.s.pIface, pThis->u.s.aAttachedFamilies[i]);
     err = ifnet_detach(pThis->u.s.pIface);
     if (err)
@@ -470 +429 @@
     pThis->u.s.pIface = NULL;
     pThis->u.s.hEvtDetached = NIL_RTSEMEVENT;
-    memset(pThis->u.s.aAttachedFamilies, 0, sizeof(pThis->u.s.aAttachedFamilies));
 
     return VINF_SUCCESS;