diff options
| author |   provos <provos@openbsd.org> | 2001-05-31 16:27:08 +0000 |
|---|---|---|
| committer | provos <provos@openbsd.org> | 2001-05-31 16:27:08 +0000 |
| commit | 7ce0fc89ad9ee0e14f4722ce3144812006007fe4 (patch) | |
| tree | bb8a9af80ed2a8798a6905017600e9c6f7fcda45 /sys/netinet/tcp_timer.c | |
| parent | - remove emalloc() and erealloc() wrapper functions that are only used once (diff) | |
| download | wireguard-openbsd-7ce0fc89ad9ee0e14f4722ce3144812006007fe4.tar.xz wireguard-openbsd-7ce0fc89ad9ee0e14f4722ce3144812006007fe4.zip | |
Two fixes from Stevens via davidg@freebsd, bug report by
armin@wolfermann.org
- set the persist timer so that connections in CLOSING state timeout
- honor keep-alive timer in CLOSING state.
Fixes the problem in simulaneous close situation where connections
would never leave the CLOSING state and stay arround indefinitly.
Diffstat (limited to 'sys/netinet/tcp_timer.c')
| -rw-r--r-- | sys/netinet/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 4c300249da9..cfa6857a7b4 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_timer.c,v 1.20 2000/12/13 09:47:08 provos Exp $ */ +/* $OpenBSD: tcp_timer.c,v 1.21 2001/05/31 16:27:08 provos Exp $ */ /* $NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $ */ /* @@ -390,7 +390,7 @@ tcp_timers(tp, timer) 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) { + tp->t_state <= TCPS_CLOSING) { if (tp->t_idle >= tcp_keepidle + tcp_maxidle) goto dropit; /* |