diff options
| author | darrenr <darrenr@FreeBSD.org> | 2001-07-30 10:53:23 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2001-07-30 10:53:23 +0000 |
| commit | a2f0fd9705ba4e23b401532408bcfa5d0ab8c753 (patch) | |
| tree | d7779cd3b1d5771683d6dc563e1d9469fb205c19 /sys/contrib/ipfilter | |
| parent | 2754e9c466ad2fc37bba8f8bfae3035f03884315 (diff) | |
| download | FreeBSD-src-a2f0fd9705ba4e23b401532408bcfa5d0ab8c753.zip FreeBSD-src-a2f0fd9705ba4e23b401532408bcfa5d0ab8c753.tar.gz | |
fix import/merge related code problems
Diffstat (limited to 'sys/contrib/ipfilter')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_frag.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c index f9a8d9e..622d0cc 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.c +++ b/sys/contrib/ipfilter/netinet/ip_frag.c @@ -3,7 +3,6 @@ * * See the IPFILTER.LICENCE file for details on licencing. */ - #if defined(KERNEL) && !defined(_KERNEL) # define _KERNEL #endif @@ -281,9 +280,6 @@ ipfr_t *table[]; ipfr_t *f, frag; u_int idx; - if (!(fin->fin_fi.fi_fl & FI_FRAG)) - return NULL; - /* * For fragments, we record protocol, packet id, TOS and both IP#'s * (these should all be the same for all fragments of a packet). @@ -315,15 +311,16 @@ ipfr_t *table[]; IPFR_CMPSZ)) { u_short atoff, off; + off = fin->fin_off; + /* * XXX - We really need to be guarding against the * retransmission of (src,dst,id,offset-range) here * because a fragmented packet is never resent with * the same IP ID#. */ - off = ip->ip_off & IP_OFFMASK; if (f->ipfr_seen0) { - if (!off || (fin->fin_fi.fi_fl & FI_SHORT)) + if (!off || (fin->fin_fl & FI_SHORT)) continue; } else if (!off) f->ipfr_seen0 = 1; |
