summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_timer.c
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1994-10-14 16:01:48 +0000
committermycroft <mycroft@NetBSD.org>1994-10-14 16:01:48 +0000
commit63bb09e6daf7baab60dc67d18befe73fb5035ec6 (patch)
tree40e1541de26edcbe326d3cdebd58b6c765e9a22e /sys/netinet/tcp_timer.c
parent6f5794ecbab7c733faf4f4dc3772bac65bc67735 (diff)
Don't return received data to the user until the initial handshake is complete.
Also use TCPS_HAVEESTABLISHED() in a few other places.
Diffstat (limited to 'sys/netinet/tcp_timer.c')
-rw-r--r--sys/netinet/tcp_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index ec4150c61e3..a05631adaf2 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.8 1994/06/29 06:38:48 cgd Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.9 1994/10/14 16:01:52 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -270,7 +270,7 @@ tcp_timers(tp, timer)
*/
case TCPT_KEEP:
tcpstat.tcps_keeptimeo++;
- if (tp->t_state < TCPS_ESTABLISHED)
+ if (TCPS_HAVEESTABLISHED(tp->t_state) == 0)
goto dropit;
if (tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE &&
tp->t_state <= TCPS_CLOSE_WAIT) {