d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix import/merge related code problems

Browse Source
This commit is contained in:
Darren Reed 2001-07-30 10:53:23 +00:00
parent af1852503e
commit 31f3bf83f6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/contrib/ipfilter/netinet/ip_frag.c
View File

@ -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;