Import of Darren Reed's IPFilter 3.3.4, including OpenBSD patches.

Many, many enhancements and improvements, including new in-kernel
proxies, enhancements to logging, and many bugfixes.

Note: Man pages have not yet been re-converted to mdoc.

1 files changed, 41 insertions, 22 deletions

diff --git a/sys/netinet/ip_state.h b/sys/netinet/ip_state.h
index 20aa1b819d3..8752f068b98 100644
--- a/sys/netinet/ip_state.h
+++ b/sys/netinet/ip_state.h
@@ -1,4 +1,4 @@
-/*       $OpenBSD: ip_state.h,v 1.9 1999/02/05 05:58:54 deraadt Exp $       */
+/* $OpenBSD: ip_state.h,v 1.10 1999/12/15 05:20:23 kjell Exp $ */
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
  *
@@ -7,7 +7,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 1.9 1999/02/05 05:58:54 deraadt Exp $
+ * $Id: ip_state.h,v 1.10 1999/12/15 05:20:23 kjell Exp $
  */
 #ifndef	__IP_STATE_H__
 #define	__IP_STATE_H__
@@ -32,13 +32,16 @@ typedef struct icmpstate {
 	u_char	ics_type;
 } icmpstate_t;
 
+typedef	struct	tcpdata	{
+	u_32_t	td_end;
+	u_32_t	td_maxend;
+	u_short	td_maxwin;
+} tcpdata_t;
+
 typedef	struct tcpstate {
 	u_short	ts_sport;
 	u_short	ts_dport;
-	u_long	ts_seq;
-	u_long	ts_ack;
-	u_short	ts_swin;
-	u_short	ts_dwin;
+	tcpdata_t ts_data[2];
 	u_char	ts_state[2];
 } tcpstate_t;
 
@@ -50,16 +53,18 @@ typedef struct ipstate {
 	U_QUAD_T	is_bytes;
 	void	*is_ifpin;
 	void	*is_ifpout;
+	frentry_t	*is_rule;
 	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;
+	u_char	is_p;			/* Protocol */
+	u_char	is_rout;		/* Is rule in/out ? */
+	u_32_t	is_flags;
+	u_32_t	is_opt;			/* packet options set */
+	u_32_t	is_optmsk;		/*    "      "    mask */
+	u_short	is_sec;			/* security options set */
+	u_short	is_secmsk;		/*    "        "    mask */
+	u_short	is_auth;		/* authentication options set */
+	u_short	is_authmsk;		/*    "              "    mask */
 	union {
 		icmpstate_t	is_ics;
 		tcpstate_t	is_ts;
@@ -68,17 +73,29 @@ typedef struct ipstate {
 } ipstate_t;
 
 #define	is_icmp	is_ps.is_ics
+#define	is_type	is_icmp.ics_type
+#define	is_code	is_icmp.ics_code
 #define	is_tcp	is_ps.is_ts
 #define	is_udp	is_ps.is_us
-#define	is_seq	is_tcp.ts_seq
-#define	is_ack	is_tcp.ts_ack
-#define	is_dwin	is_tcp.ts_dwin
-#define	is_swin	is_tcp.ts_swin
+#define is_send	is_tcp.ts_data[0].td_end
+#define is_dend	is_tcp.ts_data[1].td_end
+#define is_maxswin	is_tcp.ts_data[0].td_maxwin
+#define is_maxdwin	is_tcp.ts_data[1].td_maxwin
+#define is_maxsend	is_tcp.ts_data[0].td_maxend
+#define is_maxdend	is_tcp.ts_data[1].td_maxend
 #define	is_sport	is_tcp.ts_sport
 #define	is_dport	is_tcp.ts_dport
 #define	is_state	is_tcp.ts_state
 
 #define	TH_OPENING	(TH_SYN|TH_ACK)
+/*
+ * is_flags:
+ * Bits 0 - 3 are use as a mask with the current packet's bits to check for
+ * whether it is short, tcp/udp, a fragment or the presence of IP options.
+ * Bits 4 - 7 are set from the initial packet and contain what the packet
+ * anded with bits 0-3 must match.
+ * Bits 8,9 are used to indicate wildcard source/destination port matching.
+ */
 
 
 typedef	struct	ipslog	{
@@ -88,7 +105,7 @@ typedef	struct	ipslog	{
 	struct	in_addr	isl_dst;
 	u_char	isl_p;
 	u_char	isl_flags;
-	u_char	isl_state[2]; 
+	u_char	isl_state[2];
 	u_short	isl_type;
 	union {
 		u_short	isl_filler[2];
@@ -119,6 +136,7 @@ typedef	struct	ips_stat {
 	u_long	iss_active;
 	u_long	iss_logged;
 	u_long	iss_logfail;
+	u_long	iss_inuse;
 	ipstate_t **iss_table;
 } ips_stat_t;
 
@@ -130,13 +148,14 @@ extern	u_long	fr_tcptimeout;
 extern	u_long	fr_tcpclosed;
 extern	u_long	fr_udptimeout;
 extern	u_long	fr_icmptimeout;
+extern	int	fr_stateinit __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	ipstate_t	*fr_addstate __P((ip_t *, fr_info_t *, u_int));
+extern	frentry_t	*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	void	fr_stateunload __P((void));
-extern	void	ipstate_log __P((struct ipstate *, u_short));
+extern	void	ipstate_log __P((struct ipstate *, u_int));
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 extern	int	fr_state_ioctl __P((caddr_t, u_long, int));
 #else