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

Timestamp:

Apr 19, 2010 8:20:52 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60216

Message:

NAT: udp.c assertion is corrected and similar check added into tcp_input routine.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• tcp_input.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -344 +344 @@
      */
     ip = mtod(m, struct ip *);
+    /*
+     * (vvl) ip_input substracts IP header length from ip->ip_len value.
+     * here we do the test the same as input method of UDP protocol.
+     */
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+    Assert((ip->ip_len + iphlen == m_length(m, NULL)));
+#else
+    Assert((ip->ip_len  + iphlen == m->m_len));
+#endif
     save_ip = *ip;
     save_ip.ip_len+= iphlen;

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

@@ -108 +108 @@
     len = RT_N2H_U16((u_int16_t)uh->uh_ulen);
     Assert((ip->ip_len == len));
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
     Assert((ip->ip_len + iphlen == m->m_len));
+#else
+    Assert((ip->ip_len + iphlen == m_length(m, NULL)));
+#endif
 
     if (ip->ip_len != len)