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

Timestamp:

Jul 8, 2009 10:00:30 AM (16 years ago)

Author:

vboxsync

Message:

NAT: incorrect m_adj usage

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -529 +529 @@
     {
         int new_m_size;
-        m_adj(m, if_maxlinkhdr);
+        m->m_data += if_maxlinkhdr;
         new_m_size = sizeof(struct ip) + ICMP_MINLEN + msrc->m_len + ICMP_MAXDATALEN;
         if (new_m_size>m->m_size)

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

@@ -201 +201 @@
                 goto sendorfree;
             }
-            m_adj(m, if_maxlinkhdr);
+            m->m_data += if_maxlinkhdr;
             mhip = mtod(m, struct ip *);
             *mhip = *ip;

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

@@ -188 +188 @@
 m_adj(struct mbuf *m, int len)
 {
+    int mlen = m->m_len;
     if (m == NULL)
         return;
@@ -202 +203 @@
         m->m_len -= len;
     }
+    Assert(m->m_len > 0);
 }
 

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

@@ -576 +576 @@
         }
         /* adjust both parameters to maks M_FREEROOM calculate correct */
-        m_adj(m, if_maxlinkhdr + sizeof(struct udphdr) + sizeof(struct ip));
+        m->m_data += if_maxlinkhdr + sizeof(struct udphdr) + sizeof(struct ip);
 
         /*