Changeset 30350 in vbox

Timestamp:

Jun 22, 2010 2:39:23 AM (14 years ago)

Author:

vboxsync

Message:

NAT: Don't m_free mbuf just after send,
it's responsible of recv threads to release mbuf.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_input.c (modified) (2 diffs)
• slirp.c (modified) (2 diffs)
• tcp_input.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -121 +121 @@
         int rc;
         STAM_PROFILE_START(&pData->StatALIAS_input, b);
-        rc = LibAliasIn(select_alias(pData, m), mtod(m, char *), m->m_len);
+        rc = LibAliasIn(select_alias(pData, m), mtod(m, char *), m_length(m, NULL));
         STAM_PROFILE_STOP(&pData->StatALIAS_input, b);
         Log2(("NAT: LibAlias return %d\n", rc));
@@ -196 +196 @@
     {
         icmp_error(pData, m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, "ttl");
-        goto bad;
+        /* don't let this mbuf to be freed */
+        return;
     }
 

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

@@ -1444 +1444 @@
                 memcpy(rah->ar_tip, ah->ar_sip, 4);
                 if_encap(pData, ETH_P_ARP, mr, ETH_ENCAP_URG);
-                m_freem(pData, m);
             }
             /* Gratuitous ARP */
@@ -1456 +1455 @@
                 if (slirp_arp_cache_update(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]) == 0)
                 {
-                    m_freem(pData, mr);
                     m_freem(pData, m);
                     break;

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

@@ -798 +798 @@
                 }
                 tp = tcp_close(pData, tp);
-                m_freem(pData, m);
             }
             else

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

@@ -190 +190 @@
         dst.sin_addr.s_addr = ip->ip_src.s_addr;
         dst.sin_port = uh->uh_sport;
-        /* udp_output2 will do opposite operations on mbuf*/
+
+        /* udp_output2 expects pointer on the body of UDP packet. */
 
         m->m_data += sizeof(struct udpiphdr);
         m->m_len -= sizeof(struct udpiphdr);
         udp_output2(pData, NULL, m, &src, &dst, IPTOS_LOWDELAY);
-        goto done;
+        /* we shouldn't free this mbuf*/
+        return;
     }
     /*