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

Timestamp:

Sep 14, 2009 2:07:40 PM (15 years ago)

Author:

vboxsync

Message:

NAT: update rigth IP header while reassembling.

File:

• trunk/src/VBox/Devices/Network/slirp/ip_input.c (modified) (4 diffs)

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

@@ -203 +203 @@
         }
         ip = mtod(m, struct ip *);
-        hlen = ip->ip_len;
+        hlen = ip->ip_hl << 2;
     }
     else
@@ -490 +490 @@
         q->m_nextpkt = NULL;
         m_cat(pData, m, q);
+
+        m->m_len += (ip->ip_hl << 2);
+        m->m_data -= (ip->ip_hl << 2);
+        ip = mtod(m, struct ip *); /*update ip pointer */
     }
 
@@ -497 +501 @@
      * Make header visible.
      */
-#if 0
-    ip->ip_len = (ip->ip_hl << 2) + next;
-#else
+
     ip->ip_len = next;
-#endif
     ip->ip_src = fp->ipq_src;
     ip->ip_dst = fp->ipq_dst;
@@ -508 +509 @@
     RTMemFree(fp);
 
-    m->m_len += (ip->ip_hl << 2);
-    m->m_data -= (ip->ip_hl << 2);
+    Assert((ip->ip_len == next));
     /* some debugging cruft by sklower, below, will go away soon */
 #if 0