Changeset 23240 in vbox for trunk

Timestamp:

Sep 23, 2009 3:05:17 AM (15 years ago)

Author:

vboxsync

Message:

NAT: update ip pointer on each m_cat.

File:

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

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

@@ -480 +480 @@
     q = fp->ipq_frags;
     ip = GETIP(q);
-    if (next + (ip->ip_hl << 2) > IP_MAXPACKET)
+    hlen = ip->ip_hl << 2;
+    if (next + hlen > IP_MAXPACKET)
     {
         ipstat.ips_fragdropped += fp->ipq_nfrags;
@@ -499 +500 @@
         m_cat(pData, m, q);
 
-        m->m_len += (ip->ip_hl << 2);
-        m->m_data -= (ip->ip_hl << 2);
+        m->m_len += hlen;
+        m->m_data -= hlen;
         ip = mtod(m, struct ip *); /*update ip pointer */
-    }
+        hlen = ip->ip_hl << 2;
+        m->m_len -= hlen;
+        m->m_data += hlen;
+    }
+    m->m_len += hlen;
+    m->m_data -= hlen;
 
     /*