From 51a5faf6aeeb0e73fd29ad72960ab65687c49d97 Mon Sep 17 00:00:00 2001 From: fenner Date: Sat, 6 Feb 1999 00:47:45 +0000 Subject: [PATCH] Use snd_nxt, not rcv_nxt, when calculating the ISS during TIME_WAIT. This was missed in the 4.4-Lite2 merge. Noticed by: Mohan Parthasarathy and jayanth@loc201.tandem.com (vijayaraghavan_jayanth) on the tcp-impl mailing list. --- sys/netinet/tcp_input.c | 4 ++-- sys/netinet/tcp_reass.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 41454a4939ca..12f29e167e7b 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $Id: tcp_input.c,v 1.82 1998/12/03 20:23:20 dillon Exp $ + * $Id: tcp_input.c,v 1.83 1999/01/27 22:42:25 dillon Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -1196,7 +1196,7 @@ trimthenstep6: if (tiflags & TH_SYN && tp->t_state == TCPS_TIME_WAIT && SEQ_GT(ti->ti_seq, tp->rcv_nxt)) { - iss = tp->rcv_nxt + TCP_ISSINCR; + iss = tp->snd_nxt + TCP_ISSINCR; tp = tcp_close(tp); goto findpcb; } diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 41454a4939ca..12f29e167e7b 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $Id: tcp_input.c,v 1.82 1998/12/03 20:23:20 dillon Exp $ + * $Id: tcp_input.c,v 1.83 1999/01/27 22:42:25 dillon Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -1196,7 +1196,7 @@ trimthenstep6: if (tiflags & TH_SYN && tp->t_state == TCPS_TIME_WAIT && SEQ_GT(ti->ti_seq, tp->rcv_nxt)) { - iss = tp->rcv_nxt + TCP_ISSINCR; + iss = tp->snd_nxt + TCP_ISSINCR; tp = tcp_close(tp); goto findpcb; }