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

Timestamp:

Dec 13, 2008 7:10:21 PM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: support traceroute default on Unix hosts (UDP)
detaching sockets we've received ICMP message

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (6 diffs)

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

@@ -79 +79 @@
         udp_last_so = &udb;
 
-    m_free(pData, so->so_m);
+    /* check if mbuf haven't been already freed  */
+    if (so->so_m != NULL)
+        m_free(pData, so->so_m);
 
     if(so->so_next && so->so_prev)
@@ -802 +804 @@
 
     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)
+    if (icp->icmp_type != ICMP_ECHOREPLY 
+        && icp->icmp_type != ICMP_TIMXCEED 
+        && icp->icmp_type != ICMP_UNREACH)
     {
         return;
     }
 
-    if (icp->icmp_type == ICMP_TIMXCEED)
+    if (icp->icmp_type == ICMP_TIMXCEED 
+        || icp->icmp_type == ICMP_UNREACH )
         ip = &icp->icmp_ip;
 
@@ -826 +831 @@
     proto = ip->ip_p;
     /* Now ip is pointing on header we've sent from guest */
-    if (icp->icmp_type == ICMP_TIMXCEED)
+    if (icp->icmp_type == ICMP_TIMXCEED 
+        ||  icp->icmp_type == ICMP_UNREACH)
     {
         old_ip_len = (ip->ip_hl << 2) + 64;
@@ -845 +851 @@
 
     icp = (struct icmp *)((char *)ip + (ip->ip_hl << 2));
-    if (icp->icmp_type == ICMP_TIMXCEED)
+    if (icp->icmp_type == ICMP_TIMXCEED
+        || icp->icmp_type == ICMP_UNREACH)
     {
         /* according RFC 793 error messages required copy of initial IP header + 64 bit */
@@ -857 +864 @@
     LIST_REMOVE(icm, im_list);
     /* Don't call m_free here*/
-#if 0
-    if (icp->icmp_type == ICMP_TIMXCEED)
-    {
+
+    if (icp->icmp_type == ICMP_TIMXCEED
+        || icp->icmp_type == ICMP_UNREACH)
+    {
+        icm->im_so->so_m = NULL;
         switch (proto)
         {
             case  IPPROTO_UDP:
                 /*XXX: so->so_m already freed so we shouldn't call sofree */
-                if (so == udp_last_so)
-                    udp_last_so = &udb;
-                closesocket(icm->im_so->s);
-                icm->im_so->s = 1;
-                icm->im_so->so_state = SS_NOFDREF;
-                if(so->so_next && so->so_prev) {
-                    remque(pData, so);
-                    free(icm->im_so);
-                }
+                udp_detach(pData, icm->im_so);
             break;
             case  IPPROTO_TCP:
@@ -882 +883 @@
         }
     }
-#endif
     free(icm);
 }