Changeset 15788 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 5, 2009 8:41:39 AM (16 years ago)

Author:

vboxsync

Message:

NAT: fixed return value of drvNATQueueConsumer() if pfnWaitReceiveAvail() returns an error

File:

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

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

@@ -498 +498 @@
     Log(("drvNATQueueConsumer(pItem:%p, pu8Buf:%p, cb:%d)\n", pItem, pItem->pu8Buf, pItem->cb));
     Log2(("drvNATQueueConsumer: pu8Buf:\n%.Rhxd\n", pItem->pu8Buf));
-    int rc =  pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
-    if (RT_FAILURE(rc)) {
-        return RT_FAILURE(rc);
-    }
+    int rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
+    if (RT_FAILURE(rc))
+        return false;
     rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
     AssertRC(rc);
@@ -790 +789 @@
 #else
             rc = RTReqCreateQueue(&pThis->pReqQueue);
-            if (RT_FAILURE(rc)) {
+            if (RT_FAILURE(rc))
+            {
                 LogRel(("Can't create request queue\n"));
                 return rc;
@@ -796 +796 @@
 
             rc = pDrvIns->pDrvHlp->pfnPDMQueueCreate(pDrvIns, sizeof(DRVNATQUEUITEM), 50, 0, drvNATQueueConsumer, &pThis->pSendQueue);
-            if (RT_FAILURE(rc)){
+            if (RT_FAILURE(rc))
+            {
                 LogRel(("Can't create send queue\n"));
                 return rc;