patch-2.3.99-pre3 linux/net/ipv4/tcp.c

• Lines: 36
• Date: Wed Mar 22 21:51:32 2000
• Orig file: v2.3.99-pre2/linux/net/ipv4/tcp.c
• Orig date: Fri Mar 10 16:40:51 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp.c,v 1.164 2000/03/08 19:36:40 davem Exp $
+ * Version:	$Id: tcp.c,v 1.165 2000/03/23 05:30:32 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -1337,19 +1337,20 @@
 				break;
 			}
 
-			if (sk->done) {
-				copied = -ENOTCONN;
+			if (sk->shutdown & RCV_SHUTDOWN) {
+				if (!(flags&MSG_PEEK))
+					sk->done = 1;
 				break;
 			}
 
 			if (sk->state == TCP_CLOSE) {
-				if (!(flags&MSG_PEEK))
+				if (sk->done) {
+					copied = -ENOTCONN;
+					break;
+				} else if (!(flags&MSG_PEEK))
 					sk->done = 1;
 				break;
 			}
-
-			if (sk->shutdown & RCV_SHUTDOWN)
-				break;
 
 			if (!timeo) {
 				copied = -EAGAIN;