Changeset 27466 in vbox

Timestamp:

Mar 18, 2010 7:09:37 AM (15 years ago)

Author:

vboxsync

Message:

NAT: ICMP Solaris specific ip_len calculation was added.

File:

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

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

@@ -1057 +1057 @@
     ip = (struct ip *)buff;
     hlen = (ip->ip_hl << 2);
-    if (RT_N2H_U16(ip->ip_len) < hlen + ICMP_MINLEN)
+    /* 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)
     {
        Log(("send_icmp_to_guest: ICMP header is too small to understand which type/subtype of the datagram\n"));
@@ -1077 +1083 @@
      * icmp_{type(8), code(8), cksum(16),identifier(16),seqnum(16)}
      */
-    if (RT_N2H_U16(ip->ip_len) < hlen + 8)
+    if (ip->ip_len < hlen + 8)
     {
         Log(("send_icmp_to_guest: NAT accept ICMP_{ECHOREPLY, TIMXCEED, UNREACH} the minimum size is 64 (see rfc792)\n"));
@@ -1091 +1097 @@
          * icmp_{type(8), code(8), cksum(16),unused(32)} + IP header + 64 bit of original datagram
          */
-        if (RT_N2H_U16(ip->ip_len) < hlen + 2*8 + sizeof(struct ip))
+        if (ip->ip_len < hlen + 2*8 + sizeof(struct ip))
         {
             Log(("send_icmp_to_guest: NAT accept ICMP_{TIMXCEED, UNREACH} the minimum size of ipheader + 64 bit of data (see rfc792)\n"));
@@ -1111 +1117 @@
 
     src = addr->sin_addr.s_addr;
-#if 0
-    /* @todo: check why it's too strict. */
     if (type == ICMP_ECHOREPLY)
     {
@@ -1122 +1126 @@
             return;
         }
-        if (   (RT_N2H_U16(ip->ip_len) - hlen )
-            != (ip0->ip_len - (ip0->ip_hl << 2))) /* the IP header in the list is in host format */
-        {
-            Log(("NAT: ECHO lenght doesn't match ECHOREPLY\n"));
+#if 0
+        /* 
+         * @todo ip0 seems have different byte order on different OSes, e.g. on Solaris it's required
+         * to N2H, but on Linux no convertaion required.
+         */
+        if (   (ip->ip_len - hlen )
+            != (ip0->ip_len - (ip0->ip_hl << 2))) 
+        {
+            Log(("NAT: ECHO(%d) lenght doesn't match ECHOREPLY(%d)\n",
+                (ip->ip_len - hlen ), (ip0->ip_len - (ip0->ip_hl << 2))));
             return;
         }
-    }
-#endif
-
+#endif
+    }
+
+    /* ip points on origianal ip header */
     ip = mtod(m, struct ip *);
     proto = ip->ip_p;
@@ -1373 +1384 @@
 
     len = RT_N2H_U16(ip.ip_len);
+#ifdef RT_OS_SOLARIS
+    len += (ip.ip_hl << 2); /* Solaris: reports only payload length */
+#endif
     buff = RTMemAlloc(len);
     if (buff == NULL)
@@ -1396 +1410 @@
     }
     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)
     {