diff options
| author |   provos <provos@openbsd.org> | 1999-12-15 16:37:20 +0000 |
|---|---|---|
| committer | provos <provos@openbsd.org> | 1999-12-15 16:37:20 +0000 |
| commit | 474946592d24b82b2129a2b1f9940d04067ceb6e (patch) | |
| tree | afdde64f5804af4f83cb9e8d7fefb83ffb6cd123 /sys/netinet/tcp_output.c | |
| parent | add missing Xrs and clean a bit (diff) | |
| download | wireguard-openbsd-474946592d24b82b2129a2b1f9940d04067ceb6e.tar.xz wireguard-openbsd-474946592d24b82b2129a2b1f9940d04067ceb6e.zip | |
never go into persist mode if there are still segments to be retransmitted.
set retransmit timer again if it was cleared, that can happen in SACK when
there are no elligble SACK holes to be retransmitted and the receiver window
is full.
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 5b236f45cd2..593748d0d41 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.26 1999/12/10 17:51:10 itojun Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.27 1999/12/15 16:37:20 provos Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -399,6 +399,19 @@ again: if (flags & TH_FIN && ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una)) goto send; +#ifdef TCP_SACK + /* + * In SACK, it is possible for tcp_output to fail to send a segment + * after the retransmission timer has been turned off. Make sure + * that the retransmission timer is set. + */ + if (SEQ_GT(tp->snd_max, tp->snd_una) && + tp->t_timer[TCPT_REXMT] == 0 && + tp->t_timer[TCPT_PERSIST] == 0) { + tp->t_timer[TCPT_REXMT] = tp->t_rxtcur; + return (0); + } +#endif /* TCP_SACK */ /* * TCP window updates are not reliable, rather a polling protocol |