Changeset 87383 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Jan 22, 2021 10:50:05 PM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Make the list of includes less chaotic.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (2 diffs)

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

@@ -81 +81 @@
 #include "../NetLib/VBoxNetBaseService.h"
 #include "../NetLib/utils.h"
-#include "VBoxLwipCore.h"
+#include "../NetLib/VBoxPortForwardString.h"
 
 extern "C"
@@ -100 +100 @@
 }
 
-
-#if defined(VBOX_RAWSOCK_DEBUG_HELPER)          \
-    && (defined(VBOX_WITH_HARDENING)            \
-        || defined(RT_OS_WINDOWS)               \
-        || defined(RT_OS_DARWIN))
+#include "VBoxLwipCore.h"
+
+#ifdef VBOX_RAWSOCK_DEBUG_HELPER
+#if    defined(VBOX_WITH_HARDENING) /* obviously */     \
+    || defined(RT_OS_WINDOWS)       /* not used */      \
+    || defined(RT_OS_DARWIN)        /* not necessary */
 # error Have you forgotten to turn off VBOX_RAWSOCK_DEBUG_HELPER?
 #endif
-
-#ifdef VBOX_RAWSOCK_DEBUG_HELPER
+/* ask the privileged helper to create a raw socket for us */
 extern "C" int getrawsock(int type);
 #endif
 
-#include "../NetLib/VBoxPortForwardString.h"
 
 static RTGETOPTDEF g_aGetOptDef[] =