Changeset 15355 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Dec 12, 2008 8:55:52 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40789

Message:

slirp:icmp: enabling UDP traceroute on Unix

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (8 diffs)
• slirp.c (modified) (5 diffs)
• socket.c (modified) (2 diffs)
• udp.c (modified) (5 diffs)

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

@@ -81 +81 @@
     pData->icmp_socket.s = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
 # else /* !RT_OS_DARWIN */
-    pData->icmp_socket.s = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP);
+    pData->icmp_socket.s = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
 # endif /* RT_OS_DARWIN */
     if (pData->icmp_socket.s == -1)
@@ -157 +157 @@
 
 
+    LogRel(("%s: processing (proto:%d)\n", __FUNCTION__, ip->ip_p));
     switch (ip->ip_p)
     {
@@ -175 +176 @@
                     break;
                 }
+                LogRel(("Have found nothing\n"));
             }
             break;
@@ -184 +186 @@
         case IPPROTO_UDP:
             head_socket = &udb;
-            udp = (struct udphdr *)((char *)ip + (ip->ip_hl >> 2));
+            udp = (struct udphdr *)((char *)ip + (ip->ip_hl << 2));
             faddr.s_addr = ip->ip_dst.s_addr;
             fport = udp->uh_dport;
@@ -194 +196 @@
             if (head_socket == NULL)
             {
-                tcp = (struct tcphdr *)((char *)ip + (ip->ip_hl >> 2));
+                tcp = (struct tcphdr *)((char *)ip + (ip->ip_hl << 2));
                 head_socket = &tcb; /* head_socket could be initialized with udb*/
                 faddr.s_addr = ip->ip_dst.s_addr;
@@ -201 +203 @@
                 lport = tcp->th_sport;
             }
-            for (so = head_socket; so != head_socket; so = so->so_next)
+            for (so = head_socket->so_next; so != head_socket; so = so->so_next)
             {
                 /* Should be reaplaced by hash here */
+                LogRel(("trying:%R[natsock] against %R[IP4]:%d lport=%d hlport=%d\n", so, &faddr, fport, lport, so->so_hlport));
                 if (   so->so_faddr.s_addr == faddr.s_addr
                     && so->so_fport == fport
+#if 0
                     && so->so_hladdr.s_addr == laddr.s_addr
+#endif
                     && so->so_hlport == lport)
                 {
@@ -212 +217 @@
                     icm->im_m = so->so_m;
                     found = 1;
-                    break;
+                    LogRel(("hit:%R[natsock]\n", so));
+                    /*XXX: this storage not very long,
+                     * better add flag if it should removed from lis
+                     */
+                    LIST_INSERT_HEAD(&pData->icmp_msg_head, icm, im_list);
+                    break;
                 }
             }
@@ -381 +391 @@
                 /* Send the packet */
 # ifndef RT_OS_WINDOWS
+                LogRel(("NAT/ICMP: try to set TTL(%d)\n", ip->ip_ttl));
                 status = setsockopt(pData->icmp_socket.s, IPPROTO_IP, IP_TTL, (void *)&ip->ip_ttl, sizeof(ip->ip_ttl));
                 if (status < 0)

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

@@ -560 +560 @@
         }
 #endif /* VBOX_WITH_BSD_REASS */
+        ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
 
         STAM_REL_COUNTER_RESET(&pData->StatTCP);
@@ -666 +667 @@
         }
 
-        ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
     }
 
@@ -737 +737 @@
     if (link_up)
     {
+#if defined(VBOX_WITH_SLIRP_ICMP)
+# if defined(RT_OS_WINDOWS)
+        if (fIcmp)
+            sorecvfrom(pData, &pData->icmp_socket);
+# else
+        if (pData->icmp_socket.s != -1 && FD_ISSET(pData->icmp_socket.s, readfds))
+            sorecvfrom(pData, &pData->icmp_socket);
+# endif
+#endif
         /*
          * Check TCP sockets
@@ -930 +939 @@
         }
 
+#if 0
 #if defined(VBOX_WITH_SLIRP_ICMP)
 # if defined(RT_OS_WINDOWS)
@@ -938 +948 @@
             sorecvfrom(pData, &pData->icmp_socket);
 # endif
+#endif
 #endif
     }

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

@@ -591 +591 @@
                  (struct sockaddr *)&addr, sizeof (struct sockaddr));
     if (ret < 0)
+    {
+        LogRel(("UDP: sendto fails (%s)\n", strerror(errno)));
         return -1;
+    }
 
     /*
@@ -795 +798 @@
     icp = (struct icmp *)((char *)ip + (ip->ip_hl << 2));
 
+    LogRel(("ICMP:received msg(t:%d, c:%d)\n", icp->icmp_type, icp->icmp_code));
     if (icp->icmp_type != ICMP_ECHOREPLY && icp->icmp_type != ICMP_TIMXCEED)
     {
-        LogRel(("received ICMP(t:%d, c:%d)\n", icp->icmp_type, icp->icmp_code));
         return;
     }

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

@@ -72 +72 @@
     struct ip save_ip;
     struct socket *so;
+#ifdef VBOX_WITH_SLIRP_ICMP
+        int ret;
+#endif
 
     DEBUG_CALL("udp_input");
@@ -139 +142 @@
         if (uh->uh_sum)
         {
-         
+
 #endif
             if(cksum(m, len + sizeof(struct ip)))
@@ -241 +244 @@
         udp_emu(pData, so, m);
 
+#ifdef VBOX_WITH_SLIRP_ICMP
+    ip->ip_ttl = save_ip.ip_ttl;
+    ret = setsockopt(so->s, IPPROTO_IP, IP_TTL, (void *)&ip->ip_ttl, sizeof(ip->ip_ttl));
+    if (ret < 0) {
+        LogRel(("NAT: Error (%s) occurred while setting TTL(%d) attribute of IP packet to socket %R[natsock]\n", strerror(errno), ip->ip_ttl, so));
+    }
+#endif
     if(sosendto(pData, so,m) == -1)
     {
@@ -353 +363 @@
 {
     struct sockaddr_in addr;
+#ifdef VBOX_WITH_SLIRP_ICMP
+    struct sockaddr sa_addr;
+    socklen_t socklen = sizeof(struct sockaddr);
+    int status;
+#endif
 
     if ((so->s = socket(AF_INET,SOCK_DGRAM,0)) != -1)
@@ -384 +399 @@
             insque(pData, so,&udb);
 #ifdef VBOX_WITH_SLIRP_ICMP
-            so->so_hlport = addr.sin_port;
-            so->so_hladdr.s_addr = addr.sin_addr.s_addr;
+            status = getsockname(so->s, &sa_addr, &socklen);
+            Assert(status == 0 && sa_addr.sa_family == AF_INET);
+            so->so_hlport = ((struct sockaddr_in *)&sa_addr)->sin_port;
+            so->so_hladdr.s_addr = ((struct sockaddr_in *)&sa_addr)->sin_addr.s_addr;
 #endif
         }