Changeset 34034 in vbox for trunk

Timestamp:

Nov 12, 2010 5:14:26 PM (14 years ago)

Author:

vboxsync

Message:

NAT: use right mbuf lenght calculation.

File:

• trunk/src/VBox/Devices/Network/slirp/udp.c (modified) (4 diffs)

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

@@ -338 +338 @@
     register struct udpiphdr *ui;
     int error;
+    int mlen = 0;
 
     DEBUG_CALL("udp_output");
@@ -350 +351 @@
     m->m_data -= sizeof(struct udpiphdr);
     m->m_len += sizeof(struct udpiphdr);
+    mlen = m_length(m, NULL);
 
     /*
@@ -358 +360 @@
     memset(ui->ui_x1, 0, 9);
     ui->ui_pr = IPPROTO_UDP;
-    ui->ui_len = RT_H2N_U16(m->m_len - sizeof(struct ip));
+    ui->ui_len = RT_H2N_U16(mlen - sizeof(struct ip));
     /* XXXXX Check for from-one-location sockets, or from-any-location sockets */
     ui->ui_src = saddr->sin_addr;
@@ -372 +374 @@
     if (udpcksum)
     {
-        if ((ui->ui_sum = cksum(m, /* sizeof (struct udpiphdr) + */ m->m_len)) == 0)
+        if ((ui->ui_sum = cksum(m, /* sizeof (struct udpiphdr) + */ mlen)) == 0)
             ui->ui_sum = 0xffff;
     }
-    ((struct ip *)ui)->ip_len = m->m_len;
+    ((struct ip *)ui)->ip_len = mlen;
     ((struct ip *)ui)->ip_ttl = ip_defttl;
     ((struct ip *)ui)->ip_tos = iptos;