Changeset 30352 in vbox for trunk/src

Timestamp:

Jun 22, 2010 7:15:52 AM (15 years ago)

Author:

vboxsync

Message:

NAT: comments

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_output.c (modified) (3 diffs)
• udp.c (modified) (9 diffs)

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

@@ -206 +206 @@
         int mhlen, firstlen = len;
         struct mbuf **mnext = &m->m_nextpkt;
-        char *buf; /* intermediate buffer we'll use for copy from orriginal packet */
+        char *buf; /* intermediate buffer we'll use for a copy of the original packet */
         {
             struct m_tag *t;
@@ -218 +218 @@
             if (m->m_next != NULL)
             {
-                /*we've receives packet in fragments*/
+                /* we've receives packet in fragments */
                 tmplen = m_length(m, NULL);
                 tmpbuf = RTMemAlloc(tmplen);
@@ -228 +228 @@
                 tmpbuf = mtod(m, char *);
                 tmplen = m_length(m, NULL);
-
             }
 

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

@@ -161 +161 @@
 
 #endif
-            if(cksum(m, len + iphlen))
+            if (cksum(m, len + iphlen))
             {
                 udpstat.udps_badsum++;
                 Log3(("NAT: IP(id: %hd) has bad (udp) cksum\n", ip->ip_id));
-                goto bad;
+                goto bad_free_mbuf;
             }
         }
@@ -178 +178 @@
     {
         bootp_input(pData, m);
-        goto done;
+        goto done_free_mbuf;
     }
 
@@ -191 +191 @@
         dst.sin_port = uh->uh_sport;
 
-        /* udp_output2 expects pointer on the body of UDP packet. */
-
+        /* udp_output2() expects a pointer to 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);
-        /* we shouldn't free this mbuf*/
         return;
     }
@@ -206 +204 @@
     {
         tftp_input(pData, m);
-        goto done;
+        goto done_free_mbuf;
     }
 
@@ -245 +243 @@
         {
             Log2(("NAT: IP(id: %hd) failed to create socket\n", ip->ip_id));
-            goto bad;
+            goto bad_free_mbuf;
         }
         if (udp_attach(pData, so, 0) == -1)
@@ -252 +250 @@
                         ip->ip_id, errno, strerror(errno)));
             sofree(pData, so);
-            goto bad;
+            goto bad_free_mbuf;
         }
 
@@ -281 +279 @@
     {
         dnsproxy_query(pData, so, m, iphlen);
-        goto done;
+        goto done_free_mbuf;
     }
 
@@ -314 +312 @@
     *ip = save_ip;
     so->so_m = m;         /* ICMP backup */
-
     return;
 
-bad:
+bad_free_mbuf:
     Log2(("NAT: UDP(id: %hd) datagram to %R[IP4] with size(%d) claimed as bad\n",
         ip->ip_id, &ip->ip_dst, ip->ip_len));
-done:
+
+done_free_mbuf:
     /* some services like bootp(built-in), dns(buildt-in) and dhcp don't need sockets
      * and create new m'buffers to send them to guest, so we'll free their incomming
@@ -329 +327 @@
 }
 
+/**
+ * Output a UDP packet. This function will finally free the mbuf so
+ * do NOT free any passed mbuf.
+ */
 int udp_output2(PNATState pData, struct socket *so, struct mbuf *m,
                 struct sockaddr_in *saddr, struct sockaddr_in *daddr,