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

Timestamp:

Nov 27, 2008 8:13:25 AM (16 years ago)

Author:

vboxsync

Message:

Linux ICMP works now (ping, traceroute required fix ttl things)
Still require root privileges to test

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -70 +70 @@
 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;
+    so->s = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+    insque(pData, so, &udb); /*adding it udb queue*/
     return (so->s);
 }
@@ -187 +185 @@
                     errno,strerror(errno)));
         icmp_error(pData, m, ICMP_UNREACH,ICMP_UNREACH_NET, 0,strerror(errno));
+        udp_detach(pData, so);
       }
 
@@ -385 +384 @@
 
   ip->ip_ttl = MAXTTL;
+#ifndef VBOX_WITH_SLIRP_ICMP
   { /* swap */
     struct in_addr icmp_dst;
@@ -391 +391 @@
     ip->ip_src = icmp_dst;
   }
+#endif
 
   (void ) ip_output(pData, (struct socket *)NULL, m);

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])

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

@@ -412 +412 @@
             icmp_error(pData, so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
           } else {
+#ifdef VBOX_WITH_SLIRP_ICMP
+            struct ip *ip;
+            uint32_t dst;
+            ip = mtod(so->so_m, struct ip *);
+            dst = ip->ip_src.s_addr;
+            memcpy(so->so_m->m_data, buff, len); /* ovveride ther tail of old packet */
+            /* the low level expects fields to be in host format so let's convert them*/
+            ip = mtod(so->so_m, struct ip *);
+            NTOHS(ip->ip_len);
+            NTOHS(ip->ip_off);
+            NTOHS(ip->ip_id);
+            ip->ip_dst.s_addr = dst;
+#endif
             icmp_reflect(pData, so->so_m);
             so->so_m = 0; /* Don't m_free() it again! */