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

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

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

description:
Pull up revision 1.59 (requested by christos in ticket #416):
PR/25646: Perry Metzger: Commit a patch that compiles awaiting feedback.

diffstat:

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

diffs (44 lines):

diff -r 7a522fb80c11 -r f70c390f42cd sys/netinet/ip_nat.c
--- a/sys/netinet/ip_nat.c      Sun May 30 11:25:35 2004 +0000
+++ b/sys/netinet/ip_nat.c      Sun May 30 11:25:56 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_nat.c,v 1.56.2.2 2004/05/30 11:25:19 tron Exp $     */
+/*     $NetBSD: ip_nat.c,v 1.56.2.3 2004/05/30 11:25:56 tron Exp $     */
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
@@ -3529,10 +3529,10 @@
 fr_info_t *fin;
 u_32_t *passp;
 {
+       struct ifnet *ifp, *sifp;
        icmphdr_t *icmp = NULL;
        tcphdr_t *tcp = NULL;
        ipnat_t *np = NULL;
-       struct ifnet *ifp;
        u_int nflags = 0;
        u_32_t ipa, iph;
        int natadd = 1;
@@ -3544,11 +3544,11 @@
                return 0;
 
        fr = fin->fin_fr;
+       sifp = fin->fin_ifp;
        if ((fr != NULL) && !(fr->fr_flags & FR_DUP) &&
            fr->fr_tif.fd_ifp && fr->fr_tif.fd_ifp != (void *)-1)
-               ifp = fr->fr_tif.fd_ifp;
-       else
-               ifp = fin->fin_ifp;
+               fin->fin_ifp = fr->fr_tif.fd_ifp;
+       ifp = fin->fin_ifp;
 
        if (!(fin->fin_flx & FI_SHORT) && (fin->fin_off == 0)) {
                switch (fin->fin_p)
@@ -3665,6 +3665,7 @@
                        *passp = FR_BLOCK;
                fin->fin_flx |= FI_BADNAT;
        }
+       fin->fin_ifp = sifp;
        return rval;
 }