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

Timestamp:

Mar 22, 2010 9:17:14 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

59098

Message:

NAT: cosmetics; refined comments

File:

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

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

@@ -31 +31 @@
 {
 }
-
 
 struct socket *
@@ -134 +133 @@
 
     DEBUG_CALL("soread");
-    DEBUG_ARG("so = %lx", (long )so);
+    DEBUG_ARG("so = %lx", (long)so);
 
     /*
@@ -204 +203 @@
     if (nn <= 0)
     {
-#if defined(RT_OS_WINDOWS)
+#ifdef RT_OS_WINDOWS
         /*
          * Special case for WSAEnumNetworkEvents: If we receive 0 bytes that
@@ -1056 +1055 @@
 
     ip = (struct ip *)buff;
+    /* Fix ip->ip_len to  contain the total packet length including the header
+     * in _host_ byte order for all OSes. On Darwin, that value already is in
+     * host byte order. Solaris and Darwin report only the payload. */
 #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) */
+    hlen = (ip->ip_hl << 2);
 #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);
+    ip->ip_len += hlen;
+#endif
     if (ip->ip_len < hlen + ICMP_MINLEN)
     {
@@ -1108 +1108 @@
 
     icm = icmp_find_original_mbuf(pData, ip);
-
     if (icm == NULL)
     {
@@ -1134 +1133 @@
          * in ip_output0 routine only.   
          */
-        if (   (ip->ip_len - hlen )
+        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))));
+                (ip->ip_len - hlen), (ip0->ip_len - (ip0->ip_hl << 2))));
             return;
         }
@@ -1267 +1266 @@
                 break;
             case IP_SUCCESS: /* echo replied */
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
+# ifndef VBOX_WITH_SLIRP_BSD_MBUF
                 m = m_get(pData);
-#else
+# else
                 m = m_gethdr(pData, M_NOWAIT, MT_HEADER);
-#endif
+# endif
                 m->m_data += if_maxlinkhdr;
                 ip = mtod(m, struct ip *);
@@ -1289 +1288 @@
                 data_len += ICMP_MINLEN;
 
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
+# ifndef VBOX_WITH_SLIRP_BSD_MBUF
                 nbytes = (data_len + icr[i].DataSize > m->m_size? m->m_size - data_len: icr[i].DataSize);
                 memcpy(icp->icmp_data, icr[i].Data, nbytes);
-#else
+# else
                 AssertMsgFailed(("ICMP"));
-#endif
+# endif
 
                 data_len += icr[i].DataSize;
@@ -1337 +1336 @@
     }
 }
-#else /* RT_OS_WINDOWS */
+#else /* !RT_OS_WINDOWS */
 static void sorecvfrom_icmp_unix(PNATState pData, struct socket *so)
 {
@@ -1380 +1379 @@
     /* basic check of IP header */
     if (   ip.ip_v != IPVERSION
-#ifndef RT_OS_DARWIN
+# ifndef RT_OS_DARWIN
         || ip.ip_p != IPPROTO_ICMP
-#endif
-    )
+# endif
+        )
     {
         Log(("sorecvfrom_icmp_unix: 1 - step IP isn't IPv4 \n"));
         return;
     }
-#ifndef RT_OS_DARWIN
-    /* Darwin reports IP header in host format */
+# ifndef RT_OS_DARWIN
+    /* Darwin reports the IP length already in host byte order. */
     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
+# endif
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+    /* Solaris and Darwin report the payload only */
+    ip.ip_len += (ip.ip_hl << 2);
+# endif
     /* Note: ip->ip_len in host byte order (all OS) */
     len = ip.ip_len;