Changeset 19545 in vbox for trunk

Timestamp:

May 8, 2009 8:36:02 PM (16 years ago)

Author:

vboxsync

Message:

NAT: better header space reserving

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (3 diffs)

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

@@ -513 +513 @@
             return;
         }
-        m->m_data += if_maxlinkhdr;
-        m->m_data += sizeof(struct udphdr)
-                   + sizeof(struct ip); /*XXX: no options atm*/
+        /* adjust both parameters to maks M_FREEROOM calculate correct */
+        m_adj(m, if_maxlinkhdr + sizeof(struct udphdr) + sizeof(struct ip)); 
 
         /*
@@ -521 +520 @@
          * but I don't know the max packet size for DNS lookups
          */
-#if 0
         len = M_FREEROOM(m);
         /* if (so->so_fport != htons(53)) */
@@ -534 +532 @@
             }
         }
-#else
-        len = m->m_size - (if_maxlinkhdr + sizeof(struct udpiphdr)); /* get max free room here*/
-#endif
+
         m->m_len = recvfrom(so->s, m->m_data, len, 0,
                             (struct sockaddr *)&addr, &addrlen);