Changeset 14623 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 26, 2008 9:36:18 AM (16 years ago)

Author:

vboxsync

Message:

ICMP support disabled (doesn't work)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (2 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -66 +66 @@
 };
 
+#ifdef VBOX_WITH_SLIRP_ICMP
+static int
+icmp_attach(PNATState pData, struct socket *so) {
+    AssertRelease(so != NULL);
+    if (pData->icmp_socket == 0)
+        pData->icmp_socket = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+    AssertRelease(pData->icmp_socket != -1);
+    so->s = pData->icmp_socket;
+    return (so->s);
+}
+#endif /* VBOX_WITH_SLIRP_ICMP */
+
 /*
  * Process a received ICMP message.
@@ -118 +130 @@
       struct sockaddr_in addr;
       if ((so = socreate()) == NULL) goto freeit;
+#ifndef VBOX_WITH_SLIRP_ICMP
       if(udp_attach(pData, so) == -1) {
+#else
+      if(icmp_attach(pData, so) == -1) {
+#endif
         DEBUG_MISC((dfd,"icmp_input udp_attach errno = %d-%s\n",
                     errno,strerror(errno)));

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -129 +129 @@
     struct socket udb;
     struct socket *udp_last_so;
+#ifdef VBOX_WITH_SLIRP_ICMP
+    int icmp_socket;
+#endif
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
 # define VBOX_SOCKET_EVENT (pData->phEvents[VBOX_SOCKET_EVENT_INDEX])