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

Timestamp:

Jan 12, 2009 6:30:25 AM (16 years ago)

Author:

vboxsync

Message:

NAT: IP aligning doesn't really used in Slirp and real life

File:

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

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

@@ -1072 +1072 @@
     /* Note: we add to align the IP header */
 
-    if (M_FREEROOM(m) < pkt_len + 2)
-    {
-       m_inc(m, pkt_len + 2);
-    }
-    m->m_len = pkt_len + 2;
-    memcpy(m->m_data + 2, pkt, pkt_len);
+    if (M_FREEROOM(m) < pkt_len)
+    {
+       m_inc(m, pkt_len);
+    }
+    m->m_len = pkt_len ;
+    memcpy(m->m_data, pkt, pkt_len);
 
     proto = ntohs(*(uint16_t *)(pkt + 12));
@@ -1094 +1094 @@
              * the first outgoing connection gets an incorrect timestamp. */
             updtime(pData);
-            m->m_data += ETH_HLEN + 2;
-            m->m_len -= ETH_HLEN + 2;
+            m->m_data += ETH_HLEN;
+            m->m_len -= ETH_HLEN;
             ip_input(pData, m);
             break;