[src/netbsd-2-0]: src/sys/netinet Pull up revision 1.58 (requested by christo...

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

details:   https://anonhg.NetBSD.org/src/rev/97411384d50a
branches:  netbsd-2-0
changeset: 561210:97411384d50a
user:      tron <tron%NetBSD.org@localhost>
date:      Sun May 30 11:25:19 2004 +0000

description:
Pull up revision 1.58 (requested by christos in ticket #416):
PR/25103: Martin Husemann: IP Filter 4.4.1 breaks some connections when NATing
patch from Darren applied.

diffstat:

 sys/netinet/ip_nat.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r edce4f405932 -r 97411384d50a sys/netinet/ip_nat.c
--- a/sys/netinet/ip_nat.c      Sun May 30 11:24:57 2004 +0000
+++ b/sys/netinet/ip_nat.c      Sun May 30 11:25:19 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_nat.c,v 1.56.2.1 2004/05/30 11:24:52 tron Exp $     */
+/*     $NetBSD: ip_nat.c,v 1.56.2.2 2004/05/30 11:25:19 tron Exp $     */
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
@@ -3696,8 +3696,7 @@
        csump = NULL;
        np = nat->nat_ptr;
 
-       if ((natadd != 0) && (fin->fin_flx & FI_FRAG) && (np != NULL) &&
-           (np->in_flags & IPN_FRAG))
+       if ((natadd != 0) && (fin->fin_flx & FI_FRAG) && (np != NULL))
                (void) fr_nat_newfrag(fin, 0, nat);
 
        MUTEX_ENTER(&nat->nat_lock);
@@ -3977,8 +3976,7 @@
        fin->fin_fr = nat->nat_fr;
 
        if (np != NULL) {
-               if ((natadd != 0) && (fin->fin_flx & FI_FRAG) &&
-                   (np->in_flags & IPN_FRAG))
+               if ((natadd != 0) && (fin->fin_flx & FI_FRAG))
                        (void) fr_nat_newfrag(fin, 0, nat);
 
        /* ------------------------------------------------------------- */