patch-2.0.36 linux/net/ipv4/tcp.c

• Lines: 49
• Date: Sun Nov 15 10:33:21 1998
• Orig file: v2.0.35/linux/net/ipv4/tcp.c
• Orig date: Mon Jul 13 13:46:43 1998

diff -u --recursive --new-file v2.0.35/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -516,7 +516,7 @@
  * load is kept track of, if it is zero there is a strong
  * likely hood that there is a zero length chain we will
  * find with a small amount of searching, else the load is
- * what we shoot for for when the chains all have at least
+ * what we shoot for when the chains all have at least
  * one entry.  The base helps us walk the chains in an
  * order such that a good chain is found as quickly as possible.  -DaveM
  */
@@ -943,7 +943,7 @@
 		return 1;
 
 	case SEL_EX:
-		if (sk->urg_data)
+		if (sk->urg_data & URG_VALID)
 			return 1;
 		break;
 	}
@@ -1976,8 +1976,15 @@
 
 	if(sk->state == TCP_LISTEN)
 	{
-		/* Special case */
+		/* 
+		 *	Special case 
+		 */
 		tcp_set_state(sk, TCP_CLOSE);
+		/*
+		 *	Our children must die before we do now that
+		 *	sk->listening exists. It was right anyway but
+		 *	dont break this assumption.
+		 */
 		tcp_close_pending(sk);
 		release_sock(sk);
 		sk->dead = 1;
@@ -2046,11 +2053,12 @@
 			tcp_reset_msl_timer(sk, TIME_CLOSE, TCP_FIN_TIMEOUT);
 	}
 
-	sk->dead = 1;
 	release_sock(sk);
 
 	if(sk->state == TCP_CLOSE)
 		tcp_v4_unhash(sk);
+
+	sk->dead = 1;
 }