summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>1999-02-06 00:47:45 +0000
committerfenner <fenner@FreeBSD.org>1999-02-06 00:47:45 +0000
commit51a5faf6aeeb0e73fd29ad72960ab65687c49d97 (patch)
tree99e5a8a3a27b7a5145897b5c662e3f3b562fa9ab /sys/netinet
parent9123f355f2ecf6b419d9ef2b96ccdf81ae744962 (diff)
downloadFreeBSD-src-51a5faf6aeeb0e73fd29ad72960ab65687c49d97.zip
FreeBSD-src-51a5faf6aeeb0e73fd29ad72960ab65687c49d97.tar.gz
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 <Mohan.Parthasarathy@eng.Sun.COM> and jayanth@loc201.tandem.com (vijayaraghavan_jayanth) on the tcp-impl mailing list.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/tcp_input.c4
-rw-r--r--sys/netinet/tcp_reass.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 41454a4..12f29e1 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 41454a4..12f29e1 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;
}
OpenPOWER on IntegriCloud