Changeset 16788 in vbox for trunk/src

Timestamp:

Feb 16, 2009 1:34:24 PM (16 years ago)

Author:

vboxsync

Message:

NAT: get rid of assert on write opperation, giving TCP/IP stack handle the case connection will be restored or expired by system.
in the last case we should receive POLLRDHUP and POLLERR without and any IO op. bit set and let the Slirp validly termincate corresponding connection
with guest.

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (3 diffs)

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

@@ -1132 +1132 @@
                  */
 #endif
-
                 if (   so->so_state & SS_ISFCONNECTING
                     || UNIX_CHECK_FD_SET(so, NetworkEvents, readfds))
@@ -1144 +1143 @@
                         /*
                          * Never meet inq != 0 or outq != 0, anyway let it stay for a while 
-                         * in case it happens we'll able to detect it.
+                         * in case it happens we'll able to detect it. 
+                         * Give TCP/IP stack wait or expire the socket. 
                          */
                         LogRel(("NAT:%R[natsock] err(%d:%s) s(in:%d,out:%d)happens on read I/O, "
                             "other side close connection \n", so, err, strerror(err), inq, outq));
+                        CONTINUE(tcp);
                     }
-                    so->so_state = SS_NOFDREF;
-                    TCP_INPUT(pData, (struct mbuf *)NULL, sizeof(struct ip), so);
-                    CONTINUE(tcp);
+                    goto tcp_input_close;
+                }
+                if (   !UNIX_CHECK_FD_SET(so, NetworkEvents, readfds)
+                    && !UNIX_CHECK_FD_SET(so, NetworkEvents, writefds)
+                    && !UNIX_CHECK_FD_SET(so, NetworkEvents, xfds)) 
+                {
+                    LogRel(("NAT:system expires the socket %R[natsock] err(%d:%s) s(in:%d,out:%d) happens on non-I/O. "
+                            so, err, strerror(err), inq, outq));
+                    goto tcp_input_close;
                 }
                 LogRel(("NAT:%R[natsock] we've met(%d:%s) s(in:%d, out:%d) unhandled combination hup (%d) "
@@ -1163 +1170 @@
                         UNIX_CHECK_FD_SET(so, ign, xfds)));
                 /* 
-                 * Here should be other error handlings 
-                 * The error handling code above handles the errors can happens on reading
-                 * we haven't still met any cases of error on write.
+                 * Give OS's TCP/IP stack a chance to resolve an issue or expire the socket.
                  */
-                AssertRelease(!"shouldn't be here!!!");
+                CONTINUE(tcp);
+tcp_input_close:
+                so->so_state = SS_NOFDREF; /*cause connection valid tcp connection termination and socket closing */
+                TCP_INPUT(pData, (struct mbuf *)NULL, sizeof(struct ip), so);
+                CONTINUE(tcp);
             }
 #endif