From: Thomas Veerman <thomas@minix3.org>
Date: Mon, 30 Jan 2012 15:14:19 +0000 (+0000)
Subject: INET: remove erroneous assert
X-Git-Tag: v3.2.0~96
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/soc.html?a=commitdiff_plain;h=a87ec6840f14c6857bcc9a4d62cac5e88d7116cc;p=minix.git

INET: remove erroneous assert

The queue may contain established connections which have
tc_connInprogress clear.
---

diff --git a/servers/inet/generic/tcp_send.c b/servers/inet/generic/tcp_send.c
index e63cf368c..ec0fcaabf 100644
--- a/servers/inet/generic/tcp_send.c
+++ b/servers/inet/generic/tcp_send.c
@@ -1322,6 +1322,11 @@ 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++)
@@ -1332,7 +1337,6 @@ int error;
 		assert(i < TFL_LISTEN_MAX);
 		tcp_fd->tf_listenq[i]= NULL;
 
-		assert(tcp_conn->tc_connInprogress);
 		tcp_conn->tc_connInprogress= 0;
 
 		tcp_conn->tc_fd= NULL;
@@ -1368,7 +1372,6 @@ 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));