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

Timestamp:

May 6, 2009 6:54:50 AM (16 years ago)

Author:

vboxsync

Message:

NAT: wrong Ether address detection and ethernet gap detection

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_output.c (modified) (1 diff)
• slirp.c (modified) (4 diffs)

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

@@ -63 +63 @@
     DEBUG_ARG("so = %lx", (long)so);
     DEBUG_ARG("m0 = %lx", (long)m0);
-    Assert(m->m_data == m->m_dat + if_maxlinkhdr);
+    if(m->m_data != ((caddr_t)m->m_dat + if_maxlinkhdr))
+    {
+        LogRel(("NAT: ethernet detects corruption of the packet"));
+        AssertMsg(m->m_data == ((caddr_t)m->m_dat + if_maxlinkhdr), ("!!Ethernet frame corrupted!!"));
+    }
 
 #if 0 /* We do no options */

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

@@ -1516 +1516 @@
     if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) == 0) 
     {
-        goto drop;
+        /* @todo vasily: add ether logging routine in debug.c */
+        Log(("NAT: packet was addressed to other MAC\n"));
+        RTMemFree((void *)pkt);
+        return;
     }
 #endif
@@ -1562 +1565 @@
             break;
     }
-    drop:
     RTMemFree((void *)pkt);
 }
@@ -1575 +1577 @@
     m->m_len += ETH_HLEN;
     eh = mtod(m, struct ethhdr *);
+    
+    if((caddr_t)eh != (caddr_t)m->m_dat)
+    {
+        LogRel(("NAT: ethernet detects corruption of the packet"));
+        AssertMsg((caddr_t)eh == (caddr_t)m->m_dat, ("!!Ethernet frame corrupted!!"));
+    }
 
 #ifndef VBOX_WITH_NAT_SERVICE
@@ -1582 +1590 @@
     eh->h_source[5] = CTL_ALIAS;
 #else
-    Assert((caddr_t)eh == (caddr_t)m->m_dat); 
     if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) != 0) 
     {