Changeset 50068 in vbox

Timestamp:

Jan 14, 2014 2:58:46 AM (11 years ago)

Author:

vboxsync

Message:

Add ifdefed out code to use debug helper for raw ICMP sockets.
Add to the makefile commented out option to enable it.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxNetLwipNAT.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -88 +88 @@
 #  ifn1of ($(KBUILD_TARGET), darwin win)
 #   # helper for debugging unprivileged
+#   VBoxNetLwipNAT_DEFS += VBOX_RAWSOCK_DEBUG_HELPER
 #   VBoxNetLwipNAT_SOURCES += getrawsock.c
 #  endif

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

@@ -100 +100 @@
 #include "portfwd.h"
 }
+
+
+#if defined(VBOX_RAWSOCK_DEBUG_HELPER)          \
+    && (defined(VBOX_WITH_HARDENING)            \
+        || defined(RT_OS_WINDOWS)               \
+        || defined(RT_OS_DARWIN))
+# error Have you forgotten to turn off VBOX_RAWSOCK_DEBUG_HELPER?
+#endif
+
+#ifdef VBOX_RAWSOCK_DEBUG_HELPER
+extern "C" int getrawsock(int type);
+#endif
 
 #include "../NetLib/VBoxPortForwardString.h"
@@ -983 +995 @@
     {
         perror("IPPROTO_ICMP");
+#ifdef VBOX_RAWSOCK_DEBUG_HELPER
+        icmpsock4 = getrawsock(AF_INET);
+#endif
     }
 
@@ -1009 +1024 @@
     {
         perror("IPPROTO_ICMPV6");
+#ifdef VBOX_RAWSOCK_DEBUG_HELPER
+        icmpsock6 = getrawsock(AF_INET6);
+#endif
     }