Changeset 28075 in vbox

Timestamp:

Apr 7, 2010 11:42:21 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

59785

Message:

intnetinline.h: INTNETRingCommitFrameEx must account for the GSO header.

Location:

trunk

Files:

• include/VBox/intnetinline.h (modified) (2 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (3 diffs)

trunk/include/VBox/intnetinline.h

@@ -579 +579 @@
  * @param   pHdr                The frame header returned by
  *                              INTNETRingAllocateFrame.
- * @param   cbUsed              The amount of space actually used.
+ * @param   cbUsed              The amount of space actually used.  This does
+ *                              not include the GSO part.
  */
 DECLINLINE(void) INTNETRingCommitFrameEx(PINTNETRINGBUF pRingBuf, PINTNETHDR pHdr, size_t cbUsed)
@@ -589 +590 @@
     INTNETHDR_ASSERT_SANITY(pHdr, pRingBuf);
     Assert(pRingBuf->offWriteCom == ((uintptr_t)pHdr - (uintptr_t)pRingBuf));
+
+    if (pHdr->u16Type == INTNETHDR_TYPE_GSO)
+        cbUsed += sizeof(PDMNETWORKGSO);
 
     /*

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -462 +462 @@
 
 /**
- * Reads an entire SG into a fittingly size buffer.
- *
- * @param   pSG         The SG list to read.
- * @param   pvBuf       The buffer to read into (at least pSG->cbTotal in size).
- */
-DECLINLINE(void) intnetR0SgRead(PCINTNETSG pSG, void *pvBuf)
-{
-    if (pSG->cSegsUsed == 1)
-    {
-        Assert(pSG->cbTotal == pSG->aSegs[0].cb);
-        memcpy(pvBuf, pSG->aSegs[0].pv, pSG->cbTotal);
-    }
-    else
-    {
-        uint8_t       *pbDst = (uint8_t *)pvBuf;
-        unsigned const cSegs = pSG->cSegsUsed; Assert(cSegs == pSG->cSegsUsed);
-        for (unsigned iSeg = 0; iSeg < cSegs; iSeg++)
-        {
-            uint32_t cbSeg = pSG->aSegs[iSeg].cb;
-            Assert(cbSeg <= pSG->cbTotal && (uintptr_t)(pbDst - (uint8_t *)pvBuf) + cbSeg <= pSG->cbTotal);
-            memcpy(pbDst, pSG->aSegs[iSeg].pv, cbSeg);
-            pbDst += cbSeg;
-        }
-    }
-}
-
-
-
-
-
-
-
-/**
  * Retain an interface.
  *
@@ -1526 +1493 @@
     if (RT_SUCCESS(rc))
     {
-        intnetR0SgRead(pSG, pvDst);
+        INTNETSgRead(pSG, pvDst);
         if (pNewDstMac)
             ((PRTNETETHERHDR)pvDst)->DstMac = *pNewDstMac;
@@ -2437 +2404 @@
                 INTNETSgInitTempGso(&Sg, pvCurFrame, cbFrame, pGso);
                 if (pNetwork->fFlags & INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE)
-                    intnetR0IfSnoopAddr(pIf, (uint8_t *)pvCurFrame, pHdr->cbFrame, true /*fGso*/, (uint16_t *)&Sg.fFlags);
+                    intnetR0IfSnoopAddr(pIf, (uint8_t *)pvCurFrame, cbFrame, true /*fGso*/, (uint16_t *)&Sg.fFlags);
                 intnetR0NetworkSend(pNetwork, pIf, 0, &Sg, !!pTrunkIf);
             }