Changeset 53776 in vbox

Timestamp:

Jan 12, 2015 4:38:11 PM (10 years ago)

Author:

vboxsync

Message:

NAT: Make it possible to use privileged helper to obtain raw ICMP
socket when debugging unprivileged. Conditional on
VBOX_RAWSOCK_DEBUG_HELPER that is added to the makefile but is
commented out.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/slirp/ip_icmp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -677 +677 @@
  ifeq ($(KBUILD_TARGET), win)
   VBOX_SLIRP_SOURCES += Network/slirp/ip_icmpwin.c
+ else ifneq ($(KBUILD_TARGET),darwin)
+  # helper for debugging unprivileged
+#  Network/slirp/ip_icmp.c_DEFS += VBOX_RAWSOCK_DEBUG_HELPER
+#  VBOX_SLIRP_SOURCES += ../NetworkServices/NAT/getrawsock.c
  endif
 

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -56 +56 @@
 #include "slirp.h"
 #include "ip_icmp.h"
+
+#ifdef VBOX_RAWSOCK_DEBUG_HELPER
+int getrawsock(int type);
+#endif
+
 
 /* The message sent when emulating PING */
@@ -108 +113 @@
     {
         int rc = RTErrConvertFromErrno(errno);
+#  if defined(RT_OS_DARWIN) || !defined(VBOX_RAWSOCK_DEBUG_HELPER)
         LogRel(("NAT: ICMP/ping not available (could not open ICMP socket, error %Rrc)\n", rc));
         return 1;
+#  else
+        /* try to get it from privileged helper */
+        LogRel(("NAT: ICMP/ping raw socket error %Rrc, asking helper...\n", rc));
+        pData->icmp_socket.s = getrawsock(AF_INET);
+        if (pData->icmp_socket.s == -1)
+        {
+            LogRel(("NAT: ICMP/ping not available\n"));
+            return 1;
+        }
+#  endif /* !RT_OS_DARWIN && VBOX_RAWSOCK_DEBUG_HELPER */
     }
     fd_nonblock(pData->icmp_socket.s);