Changeset 28025 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Apr 7, 2010 6:37:43 AM (15 years ago)

Author:

vboxsync

Message:

intnet, VBoxNet*, network device & drivers: GSO preps.

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetARP.cpp (modified) (1 diff)
• VBoxNetUDP.cpp (modified) (5 diffs)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp

@@ -44 +44 @@
 {
     /*
-     * Valid IntNet Ethernet frame?
+     * Valid IntNet Ethernet frame? Skip GSO, no ARP in there.
      */
     PCINTNETHDR pHdr = INTNETRingGetNextFrameToRead(&pBuf->Recv);

trunk/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp

@@ -29 +29 @@
 #include <iprt/rand.h>
 #include <VBox/log.h>
+#include <VBox/pdmnetinline.h>
 #include <VBox/intnetinline.h>
 
@@ -64 +65 @@
      */
     PCINTNETHDR pHdr = INTNETRingGetNextFrameToRead(&pBuf->Recv);
-    if (!pHdr || pHdr->u16Type != INTNETHDR_TYPE_FRAME)
+    if (    !pHdr
+        ||  (   pHdr->u16Type != INTNETHDR_TYPE_FRAME
+             && pHdr->u16Type != INTNETHDR_TYPE_GSO))
         return NULL;
 
     size_t          cbFrame = pHdr->cbFrame;
     const void     *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
+    PCPDMNETWORKGSO pGso    = NULL;
+    if (pHdr->u16Type == INTNETHDR_TYPE_GSO)
+    {
+        pGso = (PCPDMNETWORKGSO)pvFrame;
+        if (!PDMNetGsoIsValid(pGso, cbFrame, cbFrame - sizeof(*pGso)))
+            return NULL;
+        /** @todo IPv6 UDP support, goes for this entire function really.  Not really
+         *        important yet since this is currently only used by the DHCP server. */
+        if (pGso->u8Type != PDMNETWORKGSOTYPE_IPV4_UDP)
+            return NULL;
+        pvFrame  = pGso + 1;
+        cbFrame -= sizeof(*pGso);
+    }
+
     PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pvFrame;
     if (pHdrs)
@@ -106 +123 @@
 
     /*
+     * If we're working on a GSO frame, we need to make sure the length fields
+     * are set correctly (they are usually set to 0).
+     */
+    if (pGso)
+        PDMNetGsoPrepForDirectUse(pGso, (void *)pvFrame, cbFrame, false /*fHeaderChecskum*/, false /*fPayloadChecksum*/);
+
+    /*
      * IP validation and matching.
      */
@@ -118 +142 @@
     /* Valid IPv4 header? */
     size_t const offIpHdr = (uintptr_t)pIpHdr - (uintptr_t)pEthHdr;
-    if (!RTNetIPv4IsHdrValid(pIpHdr, cbFrame - offIpHdr, cbFrame - offIpHdr))
+    if (!RTNetIPv4IsHdrValid(pIpHdr, cbFrame - offIpHdr, cbFrame - offIpHdr, !pGso /*fChecksum*/))
         return NULL;
 
@@ -132 +156 @@
         return NULL;
 
-    /* Validate the UDP header according to flags. */
-    size_t      offUdpHdr = (uintptr_t)pUdpHdr - (uintptr_t)pEthHdr;
-    if (fFlags & (VBOXNETUDP_MATCH_CHECKSUM | VBOXNETUDP_MATCH_REQUIRE_CHECKSUM))
+    if (!pGso)
     {
-        if (!RTNetIPv4IsUDPValid(pIpHdr, pUdpHdr, pUdpHdr + 1, cbFrame - offUdpHdr))
-            return NULL;
-        if (    (fFlags & VBOXNETUDP_MATCH_REQUIRE_CHECKSUM)
-            &&  !pUdpHdr->uh_sum)
-            return NULL;
-    }
-    else
-    {
-        if (!RTNetIPv4IsUDPSizeValid(pIpHdr, pUdpHdr, cbFrame - offUdpHdr))
-            return NULL;
+        /* Validate the UDP header according to flags. */
+        size_t      offUdpHdr = (uintptr_t)pUdpHdr - (uintptr_t)pEthHdr;
+        if (fFlags & (VBOXNETUDP_MATCH_CHECKSUM | VBOXNETUDP_MATCH_REQUIRE_CHECKSUM))
+        {
+            if (!RTNetIPv4IsUDPValid(pIpHdr, pUdpHdr, pUdpHdr + 1, cbFrame - offUdpHdr, true /*fChecksum*/))
+                return NULL;
+            if (    (fFlags & VBOXNETUDP_MATCH_REQUIRE_CHECKSUM)
+                &&  !pUdpHdr->uh_sum)
+                return NULL;
+        }
+        else
+        {
+            if (!RTNetIPv4IsUDPSizeValid(pIpHdr, pUdpHdr, cbFrame - offUdpHdr))
+                return NULL;
+        }
     }