diff options
| author | darrenr <darrenr@FreeBSD.org> | 2001-02-04 14:26:56 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2001-02-04 14:26:56 +0000 |
| commit | 48b4ca8e6a57c62a30178ad743504003bfd60b92 (patch) | |
| tree | b47e8b2fc77a6ae3122c2f25213a7861e67eee2f /sys/netinet/ip_frag.c | |
| parent | 53b25e2c4c7f67b0a0f4809050fb478bd1ff2d88 (diff) | |
| download | FreeBSD-src-48b4ca8e6a57c62a30178ad743504003bfd60b92.zip FreeBSD-src-48b4ca8e6a57c62a30178ad743504003bfd60b92.tar.gz | |
fix conflicts
Diffstat (limited to 'sys/netinet/ip_frag.c')
| -rw-r--r-- | sys/netinet/ip_frag.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c index 2a10988..7e1b8be 100644 --- a/sys/netinet/ip_frag.c +++ b/sys/netinet/ip_frag.c @@ -7,7 +7,6 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-1995 Darren Reed"; -/*static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.10.2.4 2000/06/06 15:49:15 darrenr Exp $";*/ static const char rcsid[] = "@(#)$FreeBSD$"; #endif @@ -157,6 +156,7 @@ ipfr_t *table[]; idx += ip->ip_src.s_addr; frag.ipfr_dst.s_addr = ip->ip_dst.s_addr; idx += ip->ip_dst.s_addr; + frag.ipfr_ifp = fin->fin_ifp; idx *= 127; idx %= IPFT_SIZE; @@ -271,6 +271,7 @@ ipfr_t *table[]; idx += ip->ip_src.s_addr; frag.ipfr_dst.s_addr = ip->ip_dst.s_addr; idx += ip->ip_dst.s_addr; + frag.ipfr_ifp = fin->fin_ifp; idx *= 127; idx %= IPFT_SIZE; @@ -329,16 +330,13 @@ fr_info_t *fin; ipf = ipfr_lookup(ip, fin, ipfr_nattab); if (ipf != NULL) { nat = ipf->ipfr_data; - if (nat->nat_ifp == fin->fin_ifp) { - /* - * This is the last fragment for this packet. - */ - if ((ipf->ipfr_ttl == 1) && (nat != NULL)) { - nat->nat_data = NULL; - ipf->ipfr_data = NULL; - } - } else - nat = NULL; + /* + * This is the last fragment for this packet. + */ + if ((ipf->ipfr_ttl == 1) && (nat != NULL)) { + nat->nat_data = NULL; + ipf->ipfr_data = NULL; + } } else nat = NULL; RWLOCK_EXIT(&ipf_natfrag); |
