[src/netbsd-1-5]: src/sys/netinet Pull up revision 1.30 (requested by darrenr):

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

details:   https://anonhg.NetBSD.org/src/rev/e366df21c0ad
branches:  netbsd-1-5
changeset: 491243:e366df21c0ad
user:      he <he%NetBSD.org@localhost>
date:      Sat Apr 14 20:57:34 2001 +0000

description:
Pull up revision 1.30 (requested by darrenr):
  Fix bug related to fragment cache handling.

diffstat:

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

diffs (36 lines):

diff -r 4fe1f10e368c -r e366df21c0ad sys/netinet/ip_state.c
--- a/sys/netinet/ip_state.c    Sat Apr 14 20:57:18 2001 +0000
+++ b/sys/netinet/ip_state.c    Sat Apr 14 20:57:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_state.c,v 1.26.4.1 2000/08/31 14:49:50 veego Exp $  */
+/*     $NetBSD: ip_state.c,v 1.26.4.2 2001/04/14 20:57:34 he Exp $     */
 
 /*
  * Copyright (C) 1995-2000 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_state.c,v 1.26.4.1 2000/08/31 14:49:50 veego Exp $";
+static const char rcsid[] = "$NetBSD: ip_state.c,v 1.26.4.2 2001/04/14 20:57:34 he 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.17 2000/08/08 16:01:03 darrenr Exp";
@@ -686,7 +686,7 @@
 #endif
        RWLOCK_EXIT(&ipf_state);
        fin->fin_rev = IP6NEQ(is->is_dst, fin->fin_fi.fi_dst);
-       if (fin->fin_fi.fi_fl & FI_FRAG)
+       if ((fin->fin_fi.fi_fl & FI_FRAG) && (pass & FR_KEEPFRAG))
                ipfr_newfrag(ip, fin, pass ^ FR_KEEPSTATE);
        return is;
 }
@@ -1330,7 +1330,7 @@
                fr_delstate(is);
 #endif
        RWLOCK_EXIT(&ipf_state);
-       if (fin->fin_fi.fi_fl & FI_FRAG)
+       if ((fin->fin_fi.fi_fl & FI_FRAG) && (pass & FR_KEEPFRAG))
                ipfr_newfrag(ip, fin, pass ^ FR_KEEPSTATE);
        return fr;
 }