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

Timestamp:

Dec 12, 2008 5:13:19 PM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: reverted 40806, 40808

File:

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

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

@@ -795 +795 @@
     struct icmp_msg *icm;
     uint8_t proto;
-    int hlen;
-
-#ifndef RT_OS_DARWIN
+
     ip = (struct ip *)buff;
     icp = (struct icmp *)((char *)ip + (ip->ip_hl << 2));
-#else
-    icp = (struct icmp *)buff;
-#endif
 
     LogRel(("ICMP:received msg(t:%d, c:%d)\n", icp->icmp_type, icp->icmp_code));
@@ -829 +824 @@
     proto = ip->ip_p;
     /* Now ip is pointing on header we've sent from guest */
-    hlen = ip->ip_hl << 2;
     if (icp->icmp_type == ICMP_TIMXCEED)
     {
-        old_ip_len = hlen + 64;
+        old_ip_len = (ip->ip_hl << 2) + 64;
         memcpy(ip_copy, ip, old_ip_len);
     }
@@ -840 +834 @@
 
     /* overide ther tail of old packet */
-#ifdef RT_OS_DARWIN
-    /* on Darwin don't have IP header in the buffer */
-    m->m_data += hlen;
-    m->m_len -= hlen;
-#endif
     memcpy(m->m_data, buff, len);
     m->m_len = len;
-#ifdef RT_OS_DARWIN
-    /* on Darwin don't have IP header in the buffer */
-    m->m_data -= hlen;
-    m->m_len += hlen;
-#endif
     ip = mtod(m, struct ip *); /* ip is from mbuf we've overrided */
 
@@ -863 +847 @@
 
     /* the low level expects fields to be in host format so let's convert them*/
-#ifndef RT_OS_DARWIN
-    /*On Darwin we don't get this fields from socket*/
     NTOHS(ip->ip_len);
     NTOHS(ip->ip_off);
     NTOHS(ip->ip_id);
-#endif
     ip->ip_src.s_addr = src;
     ip->ip_dst.s_addr = dst;