Changeset 15769 in vbox

Timestamp:

Dec 29, 2008 9:31:21 AM (16 years ago)

Author:

vboxsync

Message:

slirp: ARP and IP code even more unifing

File:

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

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

@@ -1038 +1038 @@
     /* Note: we add to align the IP header */
 
-#if 0
-    m->m_data += 2 + ETH_HLEN;
-    m->m_len -= 2 + ETH_HLEN;
-#endif
+    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));
@@ -1047 +1049 @@
     {
         case ETH_P_ARP:
-            memcpy(m->m_data, pkt, pkt_len);
-            m->m_len = pkt_len;
             arp_input(pData, m);
             break;
@@ -1055 +1055 @@
              * the first outgoing connection gets an incorrect timestamp. */
             updtime(pData);
-            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);
-            m->m_data += 2 + ETH_HLEN;
-            m->m_len -= 2 + ETH_HLEN;
+            m->m_data += ETH_HLEN;
+            m->m_len -= ETH_HLEN;
             ip_input(pData, m);
             break;
         default:
+            LogRel(("Unsupported protocol %x\n", proto));
+            m_free(pData, m);
             break;
     }