Changeset 20172 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jun 2, 2009 2:40:55 AM (16 years ago)

Author:

vboxsync

Message:

NAT: redability (part2)

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (1 diff)

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

@@ -964 +964 @@
             {
 #ifdef VBOX_WITH_SLIRP_DNS_PROXY
-                    Log2(("NAT: %R[natsock] expired\n", so));
-                    if (so->so_timeout != NULL)
-                    {
-                        so->so_timeout(pData, so, so->so_timeout_arg);
-                    }
+                Log2(("NAT: %R[natsock] expired\n", so));
+                if (so->so_timeout != NULL)
+                {
+                    so->so_timeout(pData, so, so->so_timeout_arg);
+                }
 #endif
 #ifdef VBOX_WITH_SLIRP_MT
                     /* we need so_next for continue our cycle*/
-                    so_next = so->so_next;
-#endif
-                    UDP_DETACH(pData, so, so_next);
-                    CONTINUE_NO_UNLOCK(udp);
-                }
-                else
-                    do_slowtimo = 1; /* Let socket expire */
-            }
-
-            /*
-             * When UDP packets are received from over the link, they're
-             * sendto()'d straight away, so no need for setting for writing
-             * Limit the number of packets queued by this session to 4.
-             * Note that even though we try and limit this to 4 packets,
-             * the session could have more queued if the packets needed
-             * to be fragmented.
-             *
-             * (XXX <= 4 ?)
-             */
-            if ((so->so_state & SS_ISFCONNECTED) && so->so_queued <= 4)
-            {
-                STAM_COUNTER_INC(&pData->StatUDPHot);
-                UDP_ENGAGE_EVENT(so, readfds);
-            }
-            LOOP_LABEL(udp, so, so_next);
-        }
-
+                so_next = so->so_next;
+#endif
+                UDP_DETACH(pData, so, so_next);
+                CONTINUE_NO_UNLOCK(udp);
+            }
+            else
+                do_slowtimo = 1; /* Let socket expire */
+        }
+    
+        /*
+         * When UDP packets are received from over the link, they're
+         * sendto()'d straight away, so no need for setting for writing
+         * Limit the number of packets queued by this session to 4.
+         * Note that even though we try and limit this to 4 packets,
+         * the session could have more queued if the packets needed
+         * to be fragmented.
+         *
+         * (XXX <= 4 ?)
+         */
+        if ((so->so_state & SS_ISFCONNECTED) && so->so_queued <= 4)
+        {
+            STAM_COUNTER_INC(&pData->StatUDPHot);
+            UDP_ENGAGE_EVENT(so, readfds);
+        }
+        LOOP_LABEL(udp, so, so_next);
     }
 done: