Changeset 19525 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

May 8, 2009 1:53:56 PM (16 years ago)

Author:

vboxsync

Message:

NAT: Correct ethernet package check

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_output.c (modified) (1 diff)
• mbuf.h (modified) (1 diff)
• slirp.c (modified) (1 diff)

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

@@ -63 +63 @@
     DEBUG_ARG("so = %lx", (long)so);
     DEBUG_ARG("m0 = %lx", (long)m0);
-    if(m->m_data != ((caddr_t)m->m_dat + if_maxlinkhdr))
+    if(m->m_data != (MBUF_HEAD(m) + if_maxlinkhdr))
     {
         LogRel(("NAT: ethernet detects corruption of the packet"));
-        AssertMsg(m->m_data == ((caddr_t)m->m_dat + if_maxlinkhdr), ("!!Ethernet frame corrupted!!"));
+        AssertMsgFailed(("!!Ethernet frame corrupted!!"));
     }
 

trunk/src/VBox/Devices/Network/slirp/mbuf.h

@@ -142 +142 @@
 struct mbuf * dtom _P((PNATState, void *));
 
+/*
+ * this macro should be used for validation and copying of Ethernet header where it really requred
+ */
+#define MBUF_HEAD(m) ((caddr_t)(((m)->m_flags & M_EXT) ? (m)->m_ext : (m)->m_dat))
+
 #endif

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

@@ -1578 +1578 @@
     eh = mtod(m, struct ethhdr *);
     
-    if((caddr_t)eh != (caddr_t)m->m_dat)
+    if(MBUF_HEAD(m) != m->m_data)
     {
         LogRel(("NAT: ethernet detects corruption of the packet"));
-        AssertMsg((caddr_t)eh == (caddr_t)m->m_dat, ("!!Ethernet frame corrupted!!"));
+        AssertMsgFailed(("!!Ethernet frame corrupted!!"));
     }