Changeset 28061 in vbox

Timestamp:

Apr 7, 2010 6:45:51 PM (15 years ago)

Author:

vboxsync

Message:

Misc.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (1 diff)
• DrvNAT.cpp (modified) (3 diffs)

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

@@ -2104 +2104 @@
         }
     }
+
+    if (cb > 0)
+        E1kLog(("%s Out of recieve buffers, dropping %u bytes", INSTANCE(pState), cb));
+
 #ifdef E1K_LEDS_WITH_MUTEX
     if (RT_LIKELY(e1kCsEnter(pState, VERR_SEM_BUSY, RT_SRC_POS) == VINF_SUCCESS))

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

@@ -429 +429 @@
              */
             /** @todo Make the NAT engine grok large frames?  Could be more efficient... */
+#if 0 /* this is for testing PDMNetGsoCarveSegmentQD. */
+            uint8_t         abHdrScratch[256];
+#endif
             uint8_t const  *pbFrame = (uint8_t const *)pSgBuf->aSegs[0].pvSeg;
             PCPDMNETWORKGSO pGso    = (PCPDMNETWORKGSO)pSgBuf->pvUser;
@@ -440 +443 @@
                     break;
 
+#if 1
                 uint32_t cbPayload;
                 uint32_t offPayload = PDMNetGsoCarveSegment(pGso, pbFrame, pSgBuf->cbUsed,
@@ -446 +450 @@
 
                 slirp_input(pThis->pNATState, m, cbPayload + pGso->cbHdrs);
+#else
+                uint32_t cbSegFrame;
+                void *pvSegFrame = PDMNetGsoCarveSegmentQD(pGso, (uint8_t *)pbFrame, pSgBuf->cbUsed, abHdrScratch,
+                                                           iSeg, cSegs, &cbSegFrame);
+                memcpy((uint8_t *)pvSeg, pvSegFrame, cbSegFrame);
+
+                slirp_input(pThis->pNATState, m, cbSegFrame);
+#endif
             }
         }