Changeset 28143 in vbox for trunk/src/VBox/Devices/Network/DrvNAT.cpp

Timestamp:

Apr 9, 2010 1:50:54 PM (15 years ago)

Author:

vboxsync

Message:

DrvNAT: disabled buffer poisoning that was accidentally left enabled by r59764.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (12 diffs)

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

@@ -220 +220 @@
 
 
-static void drvNATNotifyNATThread(PDRVNAT pThis);
-static DECLCALLBACK(void) drvNATSlowTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser);
-static DECLCALLBACK(void) drvNATFast(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser);
-
-
-
-static DECLCALLBACK(void) drvNATSlowTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
-{
-    Assert(pvUser);
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    drvNATNotifyNATThread(pThis);
-}
-
-static DECLCALLBACK(void) drvNATFastTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
-{
-    Assert(pvUser);
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    drvNATNotifyNATThread(pThis);
-}
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static void drvNATNotifyNATThread(PDRVNAT pThis, const char *pszWho);
+
 
 
@@ -323 +309 @@
     {
         drvNATRecvWakeup(pThis->pDrvIns, pThis->pRecvThread);
-        drvNATNotifyNATThread(pThis);
+        drvNATNotifyNATThread(pThis, "drvNATUrgRecvWorker");
     }
 }
@@ -335 +321 @@
     STAM_PROFILE_START(&pThis->StatNATRecvWait, b);
 
-    while(ASMAtomicReadU32(&pThis->cUrgPkt) != 0)
+    while (ASMAtomicReadU32(&pThis->cUrgPkt) != 0)
     {
         rc = RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
         if (   RT_FAILURE(rc)
-            && ( rc == VERR_TIMEOUT
-                 || rc == VERR_INTERRUPTED))
+            && (   rc == VERR_TIMEOUT
+                || rc == VERR_INTERRUPTED))
             goto done_unlocked;
     }
@@ -354 +340 @@
     }
     else if (   RT_FAILURE(rc)
-             && (  rc != VERR_TIMEOUT
-                && rc != VERR_INTERRUPTED))
+             && rc != VERR_TIMEOUT
+             && rc != VERR_INTERRUPTED)
     {
         AssertRC(rc);
@@ -370 +356 @@
     ASMAtomicDecU32(&pThis->cPkt);
 
-    drvNATNotifyNATThread(pThis);
+    drvNATNotifyNATThread(pThis, "drvNATRecvWorker");
 
     STAM_PROFILE_STOP(&pThis->StatNATRecvWait, b);
@@ -525 +511 @@
     pSgBuf->cSegs       = 1;
 
-#if 1 /* poison */
+#if 0 /* poison */
     memset(pSgBuf->aSegs[0].pvSeg, 'F', pSgBuf->aSegs[0].cbSeg);
 #endif
@@ -562 +548 @@
         if (RT_SUCCESS(rc))
         {
-            drvNATNotifyNATThread(pThis);
+            drvNATNotifyNATThread(pThis, "drvNATNetworkUp_SendBuf");
             return VINF_SUCCESS;
         }
@@ -594 +580 @@
  * Get the NAT thread out of poll/WSAWaitForMultipleEvents
  */
-static void drvNATNotifyNATThread(PDRVNAT pThis)
+static void drvNATNotifyNATThread(PDRVNAT pThis, const char *pszWho)
 {
     int rc;
 #ifndef RT_OS_WINDOWS
-    /* kick select() */
+    /* kick poll() */
     rc = RTFileWrite(pThis->PipeWrite, "", 1, NULL);
 #else
@@ -664 +650 @@
     if (RT_LIKELY(rc == VERR_TIMEOUT))
     {
-        drvNATNotifyNATThread(pThis);
+        drvNATNotifyNATThread(pThis, "drvNATNetworkUp_NotifyLinkChanged");
         rc = RTReqWait(pReq, RT_INDEFINITE_WAIT);
         AssertRC(rc);
@@ -771 +757 @@
                  * XXX:Make it reading exactly we need to drain the pipe.
                  */
+                /** @todo use RTPipeCreate + RTPipeRead(,biggerbuffer) here, it's
+                 *        non-blocking. */
                 RTFileRead(pThis->PipeRead, &ch, 1, &cbRead);
             }
@@ -830 +818 @@
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
 
-    drvNATNotifyNATThread(pThis);
+    drvNATNotifyNATThread(pThis, "drvNATAsyncIoWakeup");
     return VINF_SUCCESS;
 }
@@ -859 +847 @@
 #endif /* VBOX_WITH_SLIRP_MT */
 
+
+/**
+ * The callback for the fast (2 ms) NAT timer.
+ *
+ * @param   pDrvIns             The driver instance.
+ * @param   pTimer              The timer handle.
+ * @param   pvUser              The NAT instance data.
+ */
+static DECLCALLBACK(void) drvNATFastTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
+{
+    PDRVNAT pThis = (PDRVNAT)pvUser;
+    drvNATNotifyNATThread(pThis, "drvNATFastTimer");
+}
+
 void slirp_arm_fast_timer(void *pvUser)
 {
     PDRVNAT pThis = (PDRVNAT)pvUser;
-    Assert(pThis);
+    AssertPtr(pThis);
     TMTimerSetMillies(pThis->pTmrFast, 2);
 }
 
+/**
+ * The callback for the slow (500 ms) NAT timer.
+ *
+ * @param   pDrvIns             The driver instance.
+ * @param   pTimer              The timer handle.
+ * @param   pvUser              The NAT instance data.
+ */
+static DECLCALLBACK(void) drvNATSlowTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
+{
+    PDRVNAT pThis = (PDRVNAT)pvUser;
+    drvNATNotifyNATThread(pThis, "drvNATSlowTimer");
+}
+
 void slirp_arm_slow_timer(void *pvUser)
 {
     PDRVNAT pThis = (PDRVNAT)pvUser;
-    Assert(pThis);
+    AssertPtr(pThis);
     TMTimerSetMillies(pThis->pTmrSlow, 500);
 }