Changeset 30558 in vbox

Timestamp:

Jul 1, 2010 2:15:22 PM (15 years ago)

Author:

vboxsync

Message:

VBoxNetFlt-linux.c: QDisc related fixes.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -222 +222 @@
 static int vboxNetFltQdiscEnqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
-    int rc;
-    PVBOXNETQDISCPRIV pPriv = qdisc_priv(sch);
+    PVBOXNETQDISCPRIV   pPriv = qdisc_priv(sch);
+    int                 rc;
+
 #ifdef VBOXNETFLT_QDISC_ENQUEUE
     if (VALID_PTR(pPriv->pVBoxNetFlt))
@@ -230 +231 @@
         PCRTNETETHERHDR      pEtherHdr;
         PINTNETTRUNKSWPORT   pSwitchPort;
-
-        pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(skb, 0, sizeof(abHdrBuf), &abHdrBuf[0]);
+        uint32_t             cbHdrs = skb_headlen(skb);
+
+        cbHdrs = RT_MIN(cbHdrs, sizeof(abHdrBuf));
+        pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(skb, 0, cbHdrs, &abHdrBuf[0]);
         if (   pEtherHdr
             && (pSwitchPort = pPriv->pVBoxNetFlt->pSwitchPort) != NULL
             && VALID_PTR(pSwitchPort)
-            )
-        {
-            struct sk_buff      *pBuf;
-            INTNETSWDECISION    enmDecision;
-            uint32_t            cbHdrs = skb_headlen(skb);
-            cbHdrs = RT_MAX(cbHdrs, sizeof(abHdrBuf));
-
-#if 1
-            /* Test stub due to missing implementation of pfnPreRecv */
-            static uint8_t       tmpAddr[] = { 0x08, 0x00, 0x27, 0xBB, 0x1E, 0xA0 };
-            if (memcmp(pEtherHdr, tmpAddr, 6) != 0)
-                enmDecision = INTNETSWDECISION_BROADCAST;
-            else
-                enmDecision = INTNETSWDECISION_INTNET;
-#else
-            enmDecision = pSwitchPort->pfnPreRecv(pSwitchPort, pEtherHdr, cbHdrs, INTNETTRUNKDIR_HOST);
-#endif
+            && cbHdrs >= 6)
+        {
+            /** @todo consider reference counting, etc. */
+            INTNETSWDECISION enmDecision = pSwitchPort->pfnPreRecv(pSwitchPort, pEtherHdr, cbHdrs, INTNETTRUNKDIR_HOST);
             if (enmDecision == INTNETSWDECISION_INTNET)
             {
-                pBuf = skb_copy(skb, GFP_ATOMIC);
+                struct sk_buff *pBuf = skb_copy(skb, GFP_ATOMIC);
                 pBuf->pkt_type = PACKET_OUTGOING;
                 vboxNetFltLinuxForwardToIntNet(pPriv->pVBoxNetFlt, pBuf);
@@ -293 +283 @@
     while ((pSkb = pPriv->pChild->dequeue(pPriv->pChild)) != NULL)
     {
-        struct sk_buff *pBuf;
+        struct sk_buff     *pBuf;
         INTNETSWDECISION    enmDecision;
-        uint32_t            cbHdrs = skb_headlen(pSkb);
+        uint32_t            cbHdrs;
 
         --sch->q.qlen;
@@ -302 +292 @@
             break;
 
-        pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, sizeof(abHdrBuf), &abHdrBuf[0]);
+        cbHdrs = skb_headlen(pSkb);
+        cbHdrs = RT_MIN(cbHdrs, sizeof(abHdrBuf));
+        pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, cbHdrs, &abHdrBuf[0]);
         if (   !pEtherHdr
             || (pSwitchPort = pPriv->pVBoxNetFlt->pSwitchPort) == NULL
             || !VALID_PTR(pSwitchPort)
-            )
+            || cbHdrs < 6)
             break;
 
-        cbHdrs = RT_MAX(cbHdrs, sizeof(abHdrBuf));
-
-#if 1
-        /* Test stub due to missing implementation of pfnPreRecv */
-        static uint8_t       tmpAddr[] = { 0x08, 0x00, 0x27, 0xBB, 0x1E, 0xA0 };
-        if (memcmp(pEtherHdr, tmpAddr, 6) != 0)
-            enmDecision = INTNETSWDECISION_BROADCAST;
-        else
-            enmDecision = INTNETSWDECISION_INTNET;
-#else
+        /** @todo consider reference counting, etc. */
         enmDecision = pSwitchPort->pfnPreRecv(pSwitchPort, pEtherHdr, cbHdrs, INTNETTRUNKDIR_HOST);
-#endif
         if (enmDecision != INTNETSWDECISION_INTNET)
             break;
@@ -834 +816 @@
     PCRTNETETHERHDR             pEtherHdr;
     PINTNETTRUNKSWPORT          pSwitchPort;
+    uint32_t                    cbHdrs;
 
 
@@ -860 +843 @@
      *       drop it.
      */
-    pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, sizeof(abHdrBuf), &abHdrBuf[0]);
+    cbHdrs = skb_headlen(pSkb);
+    cbHdrs = RT_MIN(cbHdrs, sizeof(abHdrBuf));
+    pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, cbHdrs, &abHdrBuf[0]);
     if (   pEtherHdr
         && VALID_PTR(pOverride->pVBoxNetFlt)
         && (pSwitchPort = pOverride->pVBoxNetFlt->pSwitchPort) != NULL
         && VALID_PTR(pSwitchPort)
-       )
-    {
-        INTNETSWDECISION    enmDecision;
-        uint32_t            cbHdrs = skb_headlen(pSkb);
-        cbHdrs = RT_MAX(cbHdrs, sizeof(abHdrBuf));
+        && cbHdrs >= 6)
+    {
+        INTNETSWDECISION enmDecision;
 
         /** @todo consider reference counting, etc. */