Changeset 51690 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Jun 23, 2014 2:58:11 PM (11 years ago)

Author:

vboxsync

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

94469

Message:

NAT/Net: OS X reports IP datagrams on raw sockets with IP header
fragment offset field in host byte order too.

File:

• trunk/src/VBox/NetworkServices/NAT/pxping.c (modified) (3 diffs)

trunk/src/VBox/NetworkServices/NAT/pxping.c

@@ -1112 +1112 @@
     struct ip_hdr *iph;
     struct icmp_echo_hdr *icmph;
-    u16_t iplen;
+    u16_t iplen, ipoff;
 
     memset(&sin, 0, sizeof(sin));
@@ -1142 +1142 @@
 
     /* no fragmentation */
-    if ((IPH_OFFSET(iph) & PP_HTONS(IP_OFFMASK | IP_MF)) != 0) {
-        DPRINTF2(("%s: dropping fragmented datagram\n", __func__));
+    ipoff = IPH_OFFSET(iph);
+#if defined(RT_OS_DARWIN)
+    /* darwin reports IPH_OFFSET in host byte order */
+    ipoff = htons(ipoff);
+    IPH_OFFSET_SET(iph, ipoff);
+#endif
+    if ((ipoff & PP_HTONS(IP_OFFMASK | IP_MF)) != 0) {
+        DPRINTF2(("%s: dropping fragmented datagram (0x%04x)\n",
+                  __func__, ntohs(IPH_OFFSET(iph))));
         return;
     }
@@ -1167 +1174 @@
     /* darwin and solaris change IPH_LEN to payload length only */
     iplen += IP_HLEN;           /* we verified there are no options */
-    IPH_LEN(iph) = htons(iplen);
+    IPH_LEN_SET(iph, htons(iplen));
 #endif
     if (nread < iplen) {