Changeset 27568 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 22, 2010 3:37:08 AM (15 years ago)

Author:

vboxsync

Message:

NAT: ICMP Darwin specifics. Darwin reports IP in host format and IP.IP_LEN shows amount of bytes of datagram payload.

File:

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

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

@@ -1056 +1056 @@
 
     ip = (struct ip *)buff;
+#ifndef RT_OS_DARWIN
+    /* Darwin: send IP.IP_LEN in host format (payload only) */
+    ip->ip_len = RT_N2H_U16(ip->ip_len);
+#endif
+    /* Note: ip->ip_len in host byte order (all OS) */
+#if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+    ip->ip_len += (ip->ip_hl << 2); /* Solaris: reports only payload length */
+#endif
     hlen = (ip->ip_hl << 2);
-    /* Note: ip->ip_len in host byte order */
-    ip->ip_len = RT_N2H_U16(ip->ip_len);
-#ifdef RT_OS_SOLARIS
-    /* Solaris doesn't pass raw IP datagram, ip_len is size of payload only */
-    ip->ip_len += hlen;
-#endif
     if (ip->ip_len < hlen + ICMP_MINLEN)
     {
@@ -1161 +1163 @@
     original_hlen = ip->ip_hl << 2;
     /* saves original ip header and options */
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+    m_copyback(pData, m, original_hlen, len - hlen, buff + hlen);
+    ip->ip_len = m_length(m, NULL);
+#else
     /* m_room space in the saved m buffer */
     m_room = M_ROOM(m);
@@ -1174 +1180 @@
     }
     memcpy(m->m_data + original_hlen, buff + hlen, len - hlen);
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
     m->m_len = len - hlen + original_hlen;
     ip->ip_len = m->m_len;
-#else
-    ip->ip_len = m_length(m, NULL);
 #endif
     ip->ip_p = IPPROTO_ICMP; /* the original package could be whatever, but we're response via ICMP*/
@@ -1377 +1380 @@
     /* basic check of IP header */
     if (   ip.ip_v != IPVERSION
-        || ip.ip_p != IPPROTO_ICMP)
+#ifndef RT_OS_DARWIN
+        || ip.ip_p != IPPROTO_ICMP
+#endif
+    )
     {
         Log(("sorecvfrom_icmp_unix: 1 - step IP isn't IPv4 \n"));
         return;
     }
-
-    len = RT_N2H_U16(ip.ip_len);
-#ifdef RT_OS_SOLARIS
-    len += (ip.ip_hl << 2); /* Solaris: reports only payload length */
-#endif
+#ifndef RT_OS_DARWIN
+    /* Darwin reports IP header in host format */
+    ip.ip_len = RT_N2H_U16(ip.ip_len);
+#endif
+#if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+    ip.ip_len += (ip.ip_hl << 2); /* Solaris: reports only payload length */
+#endif
+    /* Note: ip->ip_len in host byte order (all OS) */
+    len = ip.ip_len;
     buff = RTMemAlloc(len);
     if (buff == NULL)
@@ -1405 +1415 @@
     {
         Log(("sorecvfrom_icmp_unix: 2 - step can't read IP body (would block expected:%d)\n",
-            RT_N2H_U16(ip.ip_len)));
+            ip.ip_len));
         RTMemFree(buff);
         return;
     }
     if (   len < 0
-#ifndef RT_OS_SOLARIS
-        || len < (RT_N2H_U16(ip.ip_len))
-#else
-        || len < ((RT_N2H_U16(ip.ip_len)) + (ip.ip_hl << 2))
-#endif
         || len == 0)
     {
         Log(("sorecvfrom_icmp_unix: 2 - step read of the rest of datagramm is fallen (errno:%d, len:%d expected: %d)\n",
-             errno, len, (RT_N2H_U16(ip.ip_len) - sizeof(struct ip))));
+             errno, len, (ip.ip_len - sizeof(struct ip))));
         RTMemFree(buff);
         return;