Module Name: src
Committed By: snj
Date: Sat Jul 18 21:37:34 UTC 2009
Modified Files:
src/sys/netinet [netbsd-5-0]: tcp_input.c
Log Message:
Pull up following revision(s) (requested by is in ticket #859):
sys/netinet/tcp_input.c: revision 1.296
Follow exactly the recommendation of draft-ietf-tcpm-tcpsecure-11.txt:
Don't check gainst the last ack received, but the expected sequence number.
This makes RST handling independent of delayed ACK. From Joanne M Mikkelson.
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.291.8.1 src/sys/netinet/tcp_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.291 src/sys/netinet/tcp_input.c:1.291.8.1
--- src/sys/netinet/tcp_input.c:1.291 Mon Aug 4 04:08:47 2008
+++ src/sys/netinet/tcp_input.c Sat Jul 18 21:37:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.291 2008/08/04 04:08:47 tls Exp $ */
+/* $NetBSD: tcp_input.c,v 1.291.8.1 2009/07/18 21:37:34 snj Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -145,7 +145,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.291 2008/08/04 04:08:47 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.291.8.1 2009/07/18 21:37:34 snj Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2097,7 +2097,7 @@
tcps[TCP_STAT_RCVDUPBYTE] += todrop;
TCP_STAT_PUTREF();
} else if ((tiflags & TH_RST) &&
- th->th_seq != tp->last_ack_sent) {
+ th->th_seq != tp->rcv_nxt) {
/*
* Test for reset before adjusting the sequence
* number for overlapping data.
@@ -2223,7 +2223,7 @@
* Close the tcb.
*/
if (tiflags & TH_RST) {
- if (th->th_seq != tp->last_ack_sent)
+ if (th->th_seq != tp->rcv_nxt)
goto dropafterack_ratelim;
switch (tp->t_state) {
