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

Timestamp:

Dec 12, 2008 2:04:01 PM (16 years ago)

Author:

vboxsync

Message:

icmp:slirp: attempt to fix darwin

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (3 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));
@@ -824 +829 @@
     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 = (ip->ip_hl << 2) + 64;
+        old_ip_len = hlen + 64;
         memcpy(ip_copy, ip, old_ip_len);
     }
@@ -834 +840 @@
 
     /* 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 */