Changeset 49412 in vbox

Timestamp:

Nov 8, 2013 1:16:46 AM (11 years ago)

Author:

vboxsync

Message:

VBoxNetBaseService::tryGoOnline: return iprt status code.
Adapt VBoxNetDHCP, add check in VBoxNetLwipNAT.

Location:

trunk/src/VBox/NetworkServices

Files:

• DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)
• NAT/VBoxNetLwipNAT.cpp (modified) (1 diff)
• NetLib/VBoxNetBaseService.cpp (modified) (6 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -969 +969 @@
      */
     rc = pDhcp->tryGoOnline();
-    if (rc)
+    if (RT_FAILURE(rc))
     {
         delete pDhcp;
-        return rc;
+        return 1;
     }
 
@@ -983 +983 @@
     delete pDhcp;
 
-    return rc;
+    return 0;
 }
 

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -1071 +1071 @@
     AssertRCReturn(rc, rc);
 
-    g_pLwipNat->tryGoOnline();
+    rc = g_pLwipNat->tryGoOnline();
+    if (RT_FAILURE(rc))
+    {
+        return rc;
+    }
+
     vboxLwipCoreInitialize(VBoxNetLwipNAT::onLwipTcpIpInit, this);
 

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -260 +260 @@
         m_pSession = NIL_RTR0PTR;
         LogRel(("VBoxNetBaseService: SUPR3Init -> %Rrc\n", rc));
-        return 1;
+        return rc;
     }
 
@@ -268 +268 @@
     {
         LogRel(("VBoxNetBaseService: RTPathExecDir -> %Rrc\n", rc));
-        return 1;
+        return rc;
     }
 
@@ -275 +275 @@
     {
         LogRel(("VBoxNetBaseService: SUPR3LoadVMM(\"%s\") -> %Rrc\n", szPath, rc));
-        return 1;
+        return rc;
     }
 
@@ -304 +304 @@
     {
         Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_OPEN,) failed, rc=%Rrc\n", rc));
-        goto bad;
+        return rc;
     }
     m_hIf = OpenReq.hIf;
@@ -323 +323 @@
     {
         Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS,) failed, rc=%Rrc\n", rc));
-        goto bad;
+        return rc;
     }
     pBuf = GetBufferPtrsReq.pRing3Buf;
@@ -346 +346 @@
     Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE,) failed, rc=%Rrc\n", rc));
 
-    return 0;
-    bad:
-        return 1;
+    return VINF_SUCCESS;
 }