diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 14 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_frag.h | 3 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_nat.h | 11 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_state.h | 16 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ipl.h | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_compat.h | 14 | ||||
| -rw-r--r-- | sys/netinet/ip_frag.h | 3 | ||||
| -rw-r--r-- | sys/netinet/ip_nat.h | 11 | ||||
| -rw-r--r-- | sys/netinet/ip_state.h | 16 | ||||
| -rw-r--r-- | sys/netinet/ipl.h | 2 |
10 files changed, 64 insertions, 28 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 1fe90c3..1f91cf3 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_compat.h 1.8 1/14/96 - * $Id: ip_compat.h,v 2.0.2.31.2.8 1997/12/02 13:42:52 darrenr Exp $ + * $Id: ip_compat.h,v 2.0.2.31.2.11 1998/05/23 14:29:36 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ @@ -123,7 +123,7 @@ typedef unsigned int u_32_t; # else typedef unsigned long u_32_t; # endif -#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi */ #ifndef MAX #define MAX(a,b) (((a) > (b)) ? (a) : (b)) @@ -369,6 +369,9 @@ typedef struct mbuf mb_t; * not be in other places or maybe one day linux will grow up and some * of these will turn up there too. */ +#ifndef ICMP_MINLEN +# define ICMP_MINLEN 8 +#endif #ifndef ICMP_UNREACH # define ICMP_UNREACH ICMP_DEST_UNREACH #endif @@ -680,6 +683,12 @@ typedef struct uio { # undef UINT_MAX # undef LONG_MAX # undef ULONG_MAX +# define s8 __s8 +# define u8 __u8 +# define s16 __s16 +# define u16 __u16 +# define s32 __s32 +# define u32 __u32 # include <linux/netdevice.h> # undef __KERNEL__ # endif @@ -714,4 +723,5 @@ struct ether_addr { #ifndef ICMP_ROUTERSOLICIT # define ICMP_ROUTERSOLICIT 10 #endif + #endif /* __IP_COMPAT_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/sys/contrib/ipfilter/netinet/ip_frag.h index ade7139..9122f17 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.h +++ b/sys/contrib/ipfilter/netinet/ip_frag.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_frag.h 1.5 3/24/96 - * $Id: ip_frag.h,v 2.0.2.12 1997/10/23 14:56:01 darrenr Exp $ + * $Id: ip_frag.h,v 2.0.2.12.2.1 1998/05/23 14:29:39 darrenr Exp $ */ #ifndef __IP_FRAG_H__ @@ -55,4 +55,5 @@ extern void ipfr_slowtimer __P((void)); #else extern int ipfr_slowtimer __P((void)); #endif + #endif /* __IP_FIL_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h index f0cb517..49f5d50 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.h +++ b/sys/contrib/ipfilter/netinet/ip_nat.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_nat.h 1.5 2/4/96 - * $Id: ip_nat.h,v 2.0.2.23.2.1 1997/11/05 11:08:18 darrenr Exp $ + * $Id: ip_nat.h,v 2.0.2.23.2.3 1998/05/23 18:52:44 darrenr Exp $ */ #ifndef __IP_NAT_H__ @@ -44,8 +44,8 @@ typedef struct nat { u_long nat_age; int nat_flags; - u_long nat_sumd; - u_long nat_ipsumd; + u_32_t nat_sumd; + u_32_t nat_ipsumd; void *nat_data; struct in_addr nat_inip; struct in_addr nat_outip; @@ -175,6 +175,7 @@ extern int ip_natout __P((ip_t *, int, fr_info_t *)); extern int ip_natin __P((ip_t *, int, fr_info_t *)); extern void ip_natunload __P((void)), ip_natexpire __P((void)); extern void nat_log __P((struct nat *, u_short)); -extern void fix_incksum __P((u_short *, u_long)); -extern void fix_outcksum __P((u_short *, u_long)); +extern void fix_incksum __P((u_short *, u_32_t)); +extern void fix_outcksum __P((u_short *, u_32_t)); + #endif /* __IP_NAT_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/contrib/ipfilter/netinet/ip_state.h index 3d87a21..f2ae94b 100644 --- a/sys/contrib/ipfilter/netinet/ip_state.h +++ b/sys/contrib/ipfilter/netinet/ip_state.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_state.h 1.3 1/12/96 (C) 1995 Darren Reed - * $Id: ip_state.h,v 2.0.2.14.2.1 1997/11/06 21:23:15 darrenr Exp $ + * $Id: ip_state.h,v 2.0.2.14.2.6 1998/05/24 05:18:04 darrenr Exp $ */ #ifndef __IP_STATE_H__ #define __IP_STATE_H__ @@ -47,10 +47,18 @@ typedef struct ipstate { u_int is_pass; U_QUAD_T is_pkts; U_QUAD_T is_bytes; + void *is_ifpin; + void *is_ifpout; struct in_addr is_src; struct in_addr is_dst; u_char is_p; u_char is_flags; + u_32_t is_opt; + u_32_t is_optmsk; + u_short is_sec; + u_short is_secmsk; + u_short is_auth; + u_short is_authmsk; union { icmpstate_t is_ics; tcpstate_t is_ts; @@ -120,14 +128,11 @@ extern u_long fr_tcptimeout; extern u_long fr_tcpclosed; extern u_long fr_udptimeout; extern u_long fr_icmptimeout; -extern int fr_tcpstate __P((ipstate_t *, fr_info_t *, ip_t *, - tcphdr_t *, u_short)); -extern ips_stat_t *fr_statetstats __P((void)); +extern int fr_tcpstate __P((ipstate_t *, fr_info_t *, ip_t *, tcphdr_t *)); extern int fr_addstate __P((ip_t *, fr_info_t *, u_int)); extern int fr_checkstate __P((ip_t *, fr_info_t *)); extern void fr_timeoutstate __P((void)); extern void fr_tcp_age __P((u_long *, u_char *, ip_t *, fr_info_t *, int)); -extern int fr_state_flush __P((int)); extern void fr_stateunload __P((void)); extern void ipstate_log __P((struct ipstate *, u_short)); #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -135,4 +140,5 @@ extern int fr_state_ioctl __P((caddr_t, u_long, int)); #else extern int fr_state_ioctl __P((caddr_t, int, int)); #endif + #endif /* __IP_STATE_H__ */ diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/sys/contrib/ipfilter/netinet/ipl.h index 4ad6bd3..d92ec79 100644 --- a/sys/contrib/ipfilter/netinet/ipl.h +++ b/sys/contrib/ipfilter/netinet/ipl.h @@ -11,6 +11,6 @@ #ifndef __IPL_H__ #define __IPL_H__ -#define IPL_VERSION "IP Filter v3.2.3" +#define IPL_VERSION "IP Filter v3.2.7" #endif diff --git a/sys/netinet/ip_compat.h b/sys/netinet/ip_compat.h index 1fe90c3..1f91cf3 100644 --- a/sys/netinet/ip_compat.h +++ b/sys/netinet/ip_compat.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_compat.h 1.8 1/14/96 - * $Id: ip_compat.h,v 2.0.2.31.2.8 1997/12/02 13:42:52 darrenr Exp $ + * $Id: ip_compat.h,v 2.0.2.31.2.11 1998/05/23 14:29:36 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ @@ -123,7 +123,7 @@ typedef unsigned int u_32_t; # else typedef unsigned long u_32_t; # endif -#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi */ #ifndef MAX #define MAX(a,b) (((a) > (b)) ? (a) : (b)) @@ -369,6 +369,9 @@ typedef struct mbuf mb_t; * not be in other places or maybe one day linux will grow up and some * of these will turn up there too. */ +#ifndef ICMP_MINLEN +# define ICMP_MINLEN 8 +#endif #ifndef ICMP_UNREACH # define ICMP_UNREACH ICMP_DEST_UNREACH #endif @@ -680,6 +683,12 @@ typedef struct uio { # undef UINT_MAX # undef LONG_MAX # undef ULONG_MAX +# define s8 __s8 +# define u8 __u8 +# define s16 __s16 +# define u16 __u16 +# define s32 __s32 +# define u32 __u32 # include <linux/netdevice.h> # undef __KERNEL__ # endif @@ -714,4 +723,5 @@ struct ether_addr { #ifndef ICMP_ROUTERSOLICIT # define ICMP_ROUTERSOLICIT 10 #endif + #endif /* __IP_COMPAT_H__ */ diff --git a/sys/netinet/ip_frag.h b/sys/netinet/ip_frag.h index ade7139..9122f17 100644 --- a/sys/netinet/ip_frag.h +++ b/sys/netinet/ip_frag.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_frag.h 1.5 3/24/96 - * $Id: ip_frag.h,v 2.0.2.12 1997/10/23 14:56:01 darrenr Exp $ + * $Id: ip_frag.h,v 2.0.2.12.2.1 1998/05/23 14:29:39 darrenr Exp $ */ #ifndef __IP_FRAG_H__ @@ -55,4 +55,5 @@ extern void ipfr_slowtimer __P((void)); #else extern int ipfr_slowtimer __P((void)); #endif + #endif /* __IP_FIL_H__ */ diff --git a/sys/netinet/ip_nat.h b/sys/netinet/ip_nat.h index f0cb517..49f5d50 100644 --- a/sys/netinet/ip_nat.h +++ b/sys/netinet/ip_nat.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_nat.h 1.5 2/4/96 - * $Id: ip_nat.h,v 2.0.2.23.2.1 1997/11/05 11:08:18 darrenr Exp $ + * $Id: ip_nat.h,v 2.0.2.23.2.3 1998/05/23 18:52:44 darrenr Exp $ */ #ifndef __IP_NAT_H__ @@ -44,8 +44,8 @@ typedef struct nat { u_long nat_age; int nat_flags; - u_long nat_sumd; - u_long nat_ipsumd; + u_32_t nat_sumd; + u_32_t nat_ipsumd; void *nat_data; struct in_addr nat_inip; struct in_addr nat_outip; @@ -175,6 +175,7 @@ extern int ip_natout __P((ip_t *, int, fr_info_t *)); extern int ip_natin __P((ip_t *, int, fr_info_t *)); extern void ip_natunload __P((void)), ip_natexpire __P((void)); extern void nat_log __P((struct nat *, u_short)); -extern void fix_incksum __P((u_short *, u_long)); -extern void fix_outcksum __P((u_short *, u_long)); +extern void fix_incksum __P((u_short *, u_32_t)); +extern void fix_outcksum __P((u_short *, u_32_t)); + #endif /* __IP_NAT_H__ */ diff --git a/sys/netinet/ip_state.h b/sys/netinet/ip_state.h index 3d87a21..f2ae94b 100644 --- a/sys/netinet/ip_state.h +++ b/sys/netinet/ip_state.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_state.h 1.3 1/12/96 (C) 1995 Darren Reed - * $Id: ip_state.h,v 2.0.2.14.2.1 1997/11/06 21:23:15 darrenr Exp $ + * $Id: ip_state.h,v 2.0.2.14.2.6 1998/05/24 05:18:04 darrenr Exp $ */ #ifndef __IP_STATE_H__ #define __IP_STATE_H__ @@ -47,10 +47,18 @@ typedef struct ipstate { u_int is_pass; U_QUAD_T is_pkts; U_QUAD_T is_bytes; + void *is_ifpin; + void *is_ifpout; struct in_addr is_src; struct in_addr is_dst; u_char is_p; u_char is_flags; + u_32_t is_opt; + u_32_t is_optmsk; + u_short is_sec; + u_short is_secmsk; + u_short is_auth; + u_short is_authmsk; union { icmpstate_t is_ics; tcpstate_t is_ts; @@ -120,14 +128,11 @@ extern u_long fr_tcptimeout; extern u_long fr_tcpclosed; extern u_long fr_udptimeout; extern u_long fr_icmptimeout; -extern int fr_tcpstate __P((ipstate_t *, fr_info_t *, ip_t *, - tcphdr_t *, u_short)); -extern ips_stat_t *fr_statetstats __P((void)); +extern int fr_tcpstate __P((ipstate_t *, fr_info_t *, ip_t *, tcphdr_t *)); extern int fr_addstate __P((ip_t *, fr_info_t *, u_int)); extern int fr_checkstate __P((ip_t *, fr_info_t *)); extern void fr_timeoutstate __P((void)); extern void fr_tcp_age __P((u_long *, u_char *, ip_t *, fr_info_t *, int)); -extern int fr_state_flush __P((int)); extern void fr_stateunload __P((void)); extern void ipstate_log __P((struct ipstate *, u_short)); #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -135,4 +140,5 @@ extern int fr_state_ioctl __P((caddr_t, u_long, int)); #else extern int fr_state_ioctl __P((caddr_t, int, int)); #endif + #endif /* __IP_STATE_H__ */ diff --git a/sys/netinet/ipl.h b/sys/netinet/ipl.h index 4ad6bd3..d92ec79 100644 --- a/sys/netinet/ipl.h +++ b/sys/netinet/ipl.h @@ -11,6 +11,6 @@ #ifndef __IPL_H__ #define __IPL_H__ -#define IPL_VERSION "IP Filter v3.2.3" +#define IPL_VERSION "IP Filter v3.2.7" #endif |
