[src/trunk]: src/sys/net/npf npf_tcp_inwindow: in a case of negative skew, bu...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95bf450a3339
branches:  trunk
changeset: 778544:95bf450a3339
user:      rmind <rmind%NetBSD.org@localhost>
date:      Tue Apr 03 22:14:12 2012 +0000

description:
npf_tcp_inwindow: in a case of negative skew, bump the maximum seen value of
SEQ+LEN in the receiver's side correctly (using ACK from the sender's side).

PR/46265 from Changli Gao.

diffstat:

 sys/net/npf/npf_state_tcp.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r cc80cfc257e4 -r 95bf450a3339 sys/net/npf/npf_state_tcp.c
--- a/sys/net/npf/npf_state_tcp.c       Tue Apr 03 14:58:55 2012 +0000
+++ b/sys/net/npf/npf_state_tcp.c       Tue Apr 03 22:14:12 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_state_tcp.c,v 1.3 2011/12/08 23:36:57 rmind Exp $  */
+/*     $NetBSD: npf_state_tcp.c,v 1.4 2012/04/03 22:14:12 rmind Exp $  */
 
 /*-
  * Copyright (c) 2010-2011 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_state_tcp.c,v 1.3 2011/12/08 23:36:57 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_state_tcp.c,v 1.4 2012/04/03 22:14:12 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -59,7 +59,7 @@
 
 /*
  * NPF TCP states.  Note: these states are different from the TCP FSM
- * states of RFC 793.  Mind that packet filter is a man-in-the-middle.
+ * states of RFC 793.  The packet filter is a man-in-the-middle.
  */
 #define NPF_TCPS_OK            (-1)
 #define        NPF_TCPS_CLOSED         0
@@ -430,7 +430,7 @@
         * total length of the packet is unknown - bump the boundary.
         */
        if (ackskew < 0) {
-               tstate->nst_end = end;
+               tstate->nst_end = ack;
        }
        /* Keep track of the maximum window seen. */
        if (fstate->nst_maxwin < win) {