Changeset 28443 in vbox

Timestamp:

Apr 19, 2010 6:44:03 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60214

Message:

NAT: m_free -> m_freem: BSD mbufs m_free releases only first element of the mbufs chain while m_freem releases whole chain.
in Slirp m_free and m_freem are aliases that why this change do not broke build with original mbufs.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (1 diff)
• ip_icmp.c (modified) (1 diff)
• ip_input.c (modified) (1 diff)
• slirp.c (modified) (10 diffs)
• socket.c (modified) (4 diffs)
• tcp_input.c (modified) (3 diffs)
• tcp_output.c (modified) (1 diff)
• tftp.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -687 +687 @@
     Assert(m);
     /*silently ignore*/
-    m_free(pData, m);
+    m_freem(pData, m);
     return;
 

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

@@ -686 +686 @@
 
 end_error_free_m:
-    m_free(pData, m);
+    m_freem(pData, m);
 end_error:
     LogRel(("NAT: error occurred while sending ICMP error message \n"));

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

@@ -225 +225 @@
         default:
             ipstat.ips_noproto++;
-            m_free(pData, m);
+            m_freem(pData, m);
     }
     STAM_PROFILE_STOP(&pData->StatIP_input, a);

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

@@ -1433 +1433 @@
                     || CTL_CHECK(htip, CTL_TFTP))
                     goto arp_ok;
-                m_free(pData, m);
-                m_free(pData, mr);
+                m_freem(pData, m);
+                m_freem(pData, mr);
                 return;
 
@@ -1458 +1458 @@
                 memcpy(rah->ar_tip, ah->ar_sip, 4);
                 if_encap(pData, ETH_P_ARP, mr, ETH_ENCAP_URG);
-                m_free(pData, m);
+                m_freem(pData, m);
             }
             /* Gratuitous ARP */
@@ -1470 +1470 @@
                 if (slirp_arp_cache_update(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]) == 0)
                 {
-                    m_free(pData, mr);
-                    m_free(pData, m);
+                    m_freem(pData, mr);
+                    m_freem(pData, m);
                     break;
                 }
@@ -1481 +1481 @@
             if (slirp_arp_cache_update(pData, *(uint32_t *)ah->ar_sip, &ah->ar_sha[0]) == 0)
             {
-                m_free(pData, m);
+                m_freem(pData, m);
                 break;
             }
             slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_sip, ah->ar_sha);
-            m_free(pData, m);
+            m_freem(pData, m);
             break;
 
@@ -1510 +1510 @@
     {
         LogRel(("NAT: packet having size %d has been ignored\n", m->m_len));
-        m_free(pData, m);
+        m_freem(pData, m);
         return;
     }
@@ -1546 +1546 @@
 
         case ETH_P_IPV6:
-            m_free(pData, m);
+            m_freem(pData, m);
             if (!fWarnedIpv6)
             {
@@ -1556 +1556 @@
         default:
             Log(("NAT: Unsupported protocol %x\n", proto));
-            m_free(pData, m);
+            m_freem(pData, m);
             break;
     }
@@ -1597 +1597 @@
         {
             /* don't do anything */
-            m_free(pData, m);
+            m_freem(pData, m);
             goto done;
         }
@@ -1609 +1609 @@
     {
         LogRel(("NAT: Can't alloc memory for outgoing buffer\n"));
-        m_free(pData, m);
+        m_freem(pData, m);
         goto done;
     }
@@ -1845 +1845 @@
     struct tcpcb *tp = 0;
     struct mbuf *m = (struct mbuf *)pvArg;
-    m_free(pData, m);
+    m_freem(pData, m);
 }
 #ifdef VBOX_WITH_SLIRP_MT

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

@@ -88 +88 @@
     /* check if mbuf haven't been already freed  */
     if (so->so_m != NULL)
-        m_free(pData, so->so_m);
+        m_freem(pData, so->so_m);
 #ifndef VBOX_WITH_SLIRP_MT
     if (so->so_next && so->so_prev)
@@ -601 +601 @@
                || errno == ENOTCONN))
         {
-            m_free(pData, m);
+            m_freem(pData, m);
             return;
         }
@@ -612 +612 @@
             LogRel(("NAT: can't fetch amount of bytes on socket %R[natsock], so message will be truncated.\n", so));
             signalled = 1;
-            m_free(pData, m);
+            m_freem(pData, m);
             return;
         }
@@ -678 +678 @@
                 code = ICMP_UNREACH_NET;
 
-            m_free(pData, m);
+            m_freem(pData, m);
             if (   errno == EAGAIN
                 || errno == EWOULDBLOCK

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

@@ -783 +783 @@
                 }
                 tp = tcp_close(pData, tp);
-                m_free(pData, m);
+                m_freem(pData, m);
             }
             else
@@ -1549 +1549 @@
     else
     {
-        m_free(pData, m);
+        m_freem(pData, m);
         tiflags &= ~TH_FIN;
     }
@@ -1664 +1664 @@
      * Drop space held by incoming segment and return.
      */
-    m_free(pData, m);
+    m_freem(pData, m);
 
 #ifdef VBOX_WITH_SLIRP_MT

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

@@ -680 +680 @@
 #endif
         if (m != NULL)
-            m_free(pData, m);
+            m_freem(pData, m);
         return (error);
     }

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

@@ -260 +260 @@
     if (nobytes < 0)
     {
-        m_free(pData, m);
+        m_freem(pData, m);
         /* send "file not found" error back */
         tftp_send_error(pData, spt, 1, "File not found", tp);

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

@@ -293 +293 @@
 
     if (so->so_m)
-        m_free(pData, so->so_m);   /* used for ICMP if error on sorecvfrom */
+        m_freem(pData, so->so_m);   /* used for ICMP if error on sorecvfrom */
 
     /* restore the orig mbuf packet */