]> Zhao Yanbai Git Server - minix.git/commitdiff
INET: fix 'improved' assert
authorThomas Veerman <thomas@minix3.org>
Thu, 2 Feb 2012 11:53:52 +0000 (11:53 +0000)
committerThomas Veerman <thomas@minix3.org>
Thu, 2 Feb 2012 11:53:52 +0000 (11:53 +0000)
servers/inet/generic/tcp_send.c

index ec0fcaabf5ebef4a24c934c206a10a677fb2c73b..b1d608857123ffc5cf24893d9ac7dff33c057e10 100644 (file)
@@ -1322,11 +1322,6 @@ int error;
        tcp_conn->tc_state= TCS_CLOSED;
        DBLOCK(0x10, tcp_print_state(tcp_conn); printf("\n"));
 
-       if (tcp_fd) {
-               assert(!tcp_conn->tc_connInprogress ||
-                                       (tcp_fd->tf_flags & TFF_LISTENQ));
-       }
-
        if (tcp_fd && (tcp_fd->tf_flags & TFF_LISTENQ))
        {
                for (i= 0; i<TFL_LISTEN_MAX; i++)
@@ -1372,6 +1367,7 @@ int error;
 
                if (tcp_conn->tc_connInprogress)
                        tcp_restart_connect(tcp_conn);
+               assert(!tcp_conn->tc_connInprogress);
                assert (!(tcp_fd->tf_flags & TFF_IOCTL_IP) ||
                        (printf("req= 0x%lx\n",
                        (unsigned long)tcp_fd->tf_ioreq), 0));