diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-04-07 01:06:29 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-04-07 01:06:29 +0000 |
| commit | 09589279a774f40eebc1453c937f2bee169e6d14 (patch) | |
| tree | cf3c67b966633119b84290eca52d6e5fd8b6efa7 /sys/netinet/ip_frag.h | |
| parent | e018dc20c3eb4f628f1f3c1607473966a4a9dc4e (diff) | |
Partial update to IPF 3.4.17; this fixes the *VERY* serious fragment
caching bug recently discussed in the ipfilter list.
People using IPF is urged to sync with these changes.
Diffstat (limited to 'sys/netinet/ip_frag.h')
| -rw-r--r-- | sys/netinet/ip_frag.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netinet/ip_frag.h b/sys/netinet/ip_frag.h index 352a4601063..f5e13a4fb30 100644 --- a/sys/netinet/ip_frag.h +++ b/sys/netinet/ip_frag.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_frag.h,v 1.13 2001/01/17 04:47:14 fgsch Exp $ */ +/* $OpenBSD: ip_frag.h,v 1.14 2001/04/07 01:06:28 fgsch Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -8,7 +8,7 @@ * to the original author and the contributors. * * @(#)ip_frag.h 1.5 3/24/96 - * $IPFilter: ip_frag.h,v 2.4.2.2 2000/11/10 13:10:54 darrenr Exp $ + * $IPFilter: ip_frag.h,v 2.4.2.3 2001/04/06 12:31:20 darrenr Exp $ */ #ifndef __IP_FRAG_H__ @@ -26,7 +26,8 @@ typedef struct ipfr { u_char ipfr_p; u_char ipfr_tos; u_short ipfr_off; - u_short ipfr_ttl; + u_char ipfr_ttl; + u_char ipfr_seen0; frentry_t *ipfr_rule; } ipfr_t; @@ -42,7 +43,8 @@ typedef struct ipfrstat { struct ipfr **ifs_nattab; } ipfrstat_t; -#define IPFR_CMPSZ (4 + 4 + 2 + 1 + 1) +#define IPFR_CMPSZ (offsetof(ipfr_t, ipfr_off) - \ + offsetof(ipfr_t, ipfr_src)) extern int fr_ipfrttl; extern int fr_frag_lock; |