Changeset 23202 in vbox for trunk/src/VBox

Timestamp:

Sep 22, 2009 5:31:44 AM (15 years ago)

Author:

vboxsync

Message:

NAT: don't hide bugs with extra sizes.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_output.c (modified) (2 diffs)
• mbuf.c (modified) (1 diff)

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

@@ -309 +309 @@
             mhip = mtod(m, struct ip *);
             *mhip = *ip;
+            m->m_len += ip->ip_hl << 2;
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
             m->m_pkthdr.header = mtod(m, void *);
@@ -343 +344 @@
             m->m_len += mhlen;
             RTMemFree(buf);
-            m->m_len = ntohs(mhip->ip_len);
+            m->m_len += ntohs(mhip->ip_len);
 #endif
 

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

@@ -33 +33 @@
     /*
      * Find a nice value for msize
-     * XXX if_maxlinkhdr already in mtu
      */
     msize = (if_mtu>if_mru ? if_mtu : if_mru) 
-          + if_maxlinkhdr + sizeof(struct m_hdr ) + 6;
+          + sizeof(struct m_hdr );
 }