Changeset 41455 in vbox

Timestamp:

May 28, 2012 2:31:25 AM (13 years ago)

Author:

vboxsync

Message:

NAT: Don't spend time on connections with uninitiolized template.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• socket.c (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)

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

@@ -341 +341 @@
         else
         {
+            int fUninitiolizedTemplate = 0;
+            fUninitiolizedTemplate = RT_BOOL((   sototcpcb(so)
+                                              && (  sototcpcb(so)->t_template.ti_src.s_addr == INADDR_ANY
+                                                 || sototcpcb(so)->t_template.ti_dst.s_addr == INADDR_ANY)));
             /* nn == 0 means peer has performed an orderly shutdown */
             Log2(("%s: disconnected, nn = %d, errno = %d (%s)\n",
                   __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
             sofcantrcvmore(so);
-            tcp_sockclosed(pData, sototcpcb(so));
+            if (!fUninitiolizedTemplate)
+                tcp_sockclosed(pData, sototcpcb(so));
+            else
+                tcp_drop(pData, sototcpcb(so), errno);
             SOCKET_UNLOCK(so);
             STAM_PROFILE_STOP(&pData->StatIOread, a);

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

@@ -244 +244 @@
 {
 */
+    int fUninitiolizedTemplate = 0;
 #ifndef LOG_ENABLED
     NOREF(err);
 #endif
     LogFlowFunc(("ENTER: tp = %R[tcpcb793], errno = %d\n", tp, err));
-
-    if (TCPS_HAVERCVDSYN(tp->t_state))
+    fUninitiolizedTemplate = RT_BOOL((   tp
+                                      && (  tp->t_template.ti_src.s_addr == INADDR_ANY
+                                         || tp->t_template.ti_dst.s_addr == INADDR_ANY)));
+
+    if (   TCPS_HAVERCVDSYN(tp->t_state)
+        && !fUninitiolizedTemplate)
     {
         TCP_STATE_SWITCH_TO(tp, TCPS_CLOSED);