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

Timestamp:

Aug 13, 2009 6:58:11 AM (16 years ago)

Author:

vboxsync

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

51020

Message:

NAT: cosmetics

File:

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

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

@@ -170 +170 @@
     PPDMTHREAD              thrNATRx;
     RTSEMEVENT              semNATRx;
-#endif
-    int     output_flag;
+    bool                    fCanOutput;
+#endif
 } DRVNAT;
 /** Pointer the NAT driver instance data. */
@@ -183 +183 @@
         return VINF_SUCCESS;
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
-        {
+    {
         int rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
-        int new_flag = RT_SUCCESS(rc) ? 1 : 0;
-
-        if (pThis->output_flag == 0 && new_flag == 1)
+        bool fHaveRxBuffers = RT_SUCCESS(rc);
+
+        if (!pThis->fCanOutput && fHaveRxBuffers)
         {
             int rc;
-            pThis->output_flag = new_flag;
+            pThis->fCanOutput = fHaveRxBuffers;
             /*we need inform NAT thread*/
 #ifndef RT_OS_WINDOWS
@@ -201 +201 @@
             AssertRelease(rc == TRUE);
 #endif
-        } 
-        pThis->output_flag = new_flag;
+        }
+        pThis->fCanOutput = fHaveRxBuffers;
         RTSemEventWait(pThis->semNATRx, RT_INDEFINITE_WAIT);
-        }
+    }
     return VINF_SUCCESS;
 }
@@ -221 +221 @@
  * NAT queue item.
  */
-typedef enum SLIRP_EVENT {SLIRP_CHECK, SLIRP_SEND} SLIRP_EVENT;
+enum 
+{
+    SLIRP_CHECK, 
+    SLIRP_SEND
+};
+
 typedef struct DRVNATQUEUITEM
 {
@@ -526 +531 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
-        drvNATRxWakeup(pThis->pDrvIns, pThis->thrNATRx); 
+        drvNATRxWakeup(pThis->pDrvIns, pThis->thrNATRx);
 #endif
     }
@@ -562 +567 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
         return VINF_SUCCESS;
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
-        {
+    {
         slirp_process_queue(pThis->pNATState);
-        }
+    }
     return VINF_SUCCESS;
 }
@@ -589 +595 @@
 {
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
-   return pThis->output_flag;
+   return pThis->fCanOutput;
 #else
     return 1;
@@ -840 +846 @@
     char szNetAddr[16];
     char szNetwork[32]; /* xxx.xxx.xxx.xxx/yy */
+
     LogFlow(("drvNATConstruct:\n"));
 
@@ -986 +993 @@
             rc = RTSemEventCreate(&pThis->semStatus);
             AssertRC(rc);
-            pThis->output_flag = 0;
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
+            pThis->fCanOutput = false;
             rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->thrNATRx, pThis, drvNATRx,
                                           drvNATRxWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATRX");
@@ -1081 +1088 @@
     NULL
 };
-