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_output.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_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 63d9bd94111..d7ef45444f4 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.34 2000/09/25 09:41:03 provos Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.35 2001/05/31 16:27:08 provos Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -343,15 +343,18 @@ again: * but we haven't been called to retransmit, * len will be -1. Otherwise, window shrank * after we sent into it. If window shrank to 0, - * cancel pending retransmit and pull snd_nxt - * back to (closed) window. We will enter persist - * state below. If the window didn't close completely, - * just wait for an ACK. + * cancel pending retransmit, pull snd_nxt back + * to (closed) window, and set the persist timer + * if it isn't already going. If the window didn't + * close completely, just wait for an ACK. */ len = 0; if (win == 0) { tp->t_timer[TCPT_REXMT] = 0; + tp->t_rxtshift = 0; tp->snd_nxt = tp->snd_una; + if (tp->t_timer[TCPT_PERSIST] == 0) + tcp_setpersist(tp); } } if (len > tp->t_maxseg) { |