Changeset 92613 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Nov 26, 2021 9:53:47 PM (3 years ago)

Author:

vboxsync

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

148505

Message:

SUP,IPRT,++: Adding SUPSECMAIN_FLAGS_DRIVERLESS_IEM_ALLOWED and SUPR3INIT_F_DRIVERLESS_NEM_FALLBACK to SUPLib and RTR3INIT_FLAGS_TRY_SUPLIB to RTR3Init*, the latter probably reflects the actual state there a lot better. Currently only the TRY_SUPLIB option works, the other two aren't really implemented in SUPLib yet. bugref:10138

Location:

trunk/src/VBox/NetworkServices

Files:

• Dhcpd/VBoxNetDhcpd.cpp (modified) (2 diffs)
• NAT/VBoxNetLwipNAT.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp

@@ -776 +776 @@
     VBoxNetDhcpd Dhcpd;
     int rc = Dhcpd.main(argc, argv);
-
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
@@ -786 +785 @@
 {
     int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
-    if (RT_FAILURE(rc))
-        return RTMsgInitFailure(rc);
-
-    return TrustedMain(argc, argv);
+    if (RT_SUCCESS(rc))
+        return TrustedMain(argc, argv);
+    return RTMsgInitFailure(rc);
 }
 

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

@@ -2199 +2199 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
-    int rc;
-
     LogFlowFuncEnter();
-
     NOREF(envp);
 
 #ifdef RT_OS_WINDOWS
-    WSADATA wsaData;
-    int err;
-
-    err = WSAStartup(MAKEWORD(2,2), &wsaData);
+    WSADATA WsaData = {0};
+    int err = WSAStartup(MAKEWORD(2,2), &WsaData);
     if (err)
     {
@@ -2226 +2221 @@
     }
 
-    rc = NAT.init();
+    int rc = NAT.init();
     if (RT_FAILURE(rc))
         return RTEXITCODE_INIT;
@@ -2242 +2237 @@
 {
     int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
-    if (RT_FAILURE(rc))
-        return RTMsgInitFailure(rc);
-
-    return TrustedMain(argc, argv, envp);
+    if (RT_SUCCESS(rc))
+        return TrustedMain(argc, argv, envp);
+    return RTMsgInitFailure(rc);
 }