[src/netbsd-1-6]: src/sys/netinet Pull up revision 1.39 (requested by yamt in...

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

details:   https://anonhg.NetBSD.org/src/rev/0895a84a61ac
branches:  netbsd-1-6
changeset: 527680:0895a84a61ac
user:      tv <tv%NetBSD.org@localhost>
date:      Sun Jun 02 01:05:13 2002 +0000

description:
Pull up revision 1.39 (requested by yamt in ticket #116):
make "keep state" work for SYN without win scale option.

diffstat:

 sys/netinet/ip_state.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 44eae56bf4d5 -r 0895a84a61ac sys/netinet/ip_state.c
--- a/sys/netinet/ip_state.c    Sun Jun 02 00:41:58 2002 +0000
+++ b/sys/netinet/ip_state.c    Sun Jun 02 01:05:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_state.c,v 1.38 2002/05/02 17:13:30 martti Exp $     */
+/*     $NetBSD: ip_state.c,v 1.38.4.1 2002/06/02 01:05:13 tv Exp $     */
 
 /*
  * Copyright (C) 1995-2002 by Darren Reed.
@@ -96,7 +96,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.38 2002/05/02 17:13:30 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.38.4.1 2002/06/02 01:05:13 tv Exp $");
 #else
 static const char sccsid[] = "@(#)ip_state.c   1.8 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_state.c,v 2.30.2.70 2002/04/27 16:06:15 darrenr Exp";
@@ -698,8 +698,11 @@
                        is->is_maxsend = is->is_send;
 
                        if ((tcp->th_flags & TH_SYN) &&
-                           ((tcp->th_off << 2) >= (sizeof(*tcp) + 4)))
-                               is->is_swscale = fr_tcpoptions(tcp);
+                           ((tcp->th_off << 2) >= (sizeof(*tcp) + 4))) {
+                               int wscale = fr_tcpoptions(tcp);
+                               if (wscale >= 0)
+                                       is->is_swscale = wscale;
+                       }
                }
 
                is->is_maxdwin = 1;