Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2

4 files changed, 21 insertions, 5 deletions

diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index ff17f4f..ebeaceb 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/contrib/ipfilter/man/ipf.4
@@ -99,9 +99,8 @@ Flags which are recognised in fr_pass:
         FR_INACTIVE     0x02000
         FR_QUICK        0x04000    /* quick-match and return */
         FR_FASTROUTE    0x08000
-        FR_CALLFUNC     0x10000
-        FR_CALLNOW      0x20000
-        FR_DUP          0x40000    /* duplicate the packet (not Solaris2)
+        FR_CALLNOW      0x10000
+        FR_DUP          0x20000    /* duplicate the packet (not Solaris2)
 	
 .fi
 .PP
diff --git a/contrib/ipfilter/man/ipfilter.5 b/contrib/ipfilter/man/ipfilter.5
new file mode 100644
index 0000000..03a87a5
--- /dev/null
+++ b/contrib/ipfilter/man/ipfilter.5
@@ -0,0 +1,7 @@
+.TH IPFILTER 1
+.SH NAME
+IP FIlter
+.SH DESCRIPTION
+.PP
+.SH SEE ALSO
+ipf(1), ipf(1), ipf(5), ipnat(1), ipnat(5)
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 11ac23a..e793352 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -4,7 +4,7 @@ ipmon \- monitors /dev/ipl for logged packets
 .SH SYNOPSIS
 .B ipmon
 [
-.B \-sfN
+.B \-asfnSN
 ] [
 <filename>
 ]
@@ -38,13 +38,22 @@ than pass or block.
 \- packets which have been logged and which can be considered
 "short".
 .TP
+.B \-a
+Open all of the device logfiles for reading log entries from.
+.TP
 .B \-f
 Flush the current packet log buffer.  The number of bytes flushed is displayed,
 even should the result be zero.
 .TP
-.B \-N
+.B \-n
 IP addresses and port numbers will be mapped, where possible, back into
 hostnames and service names.
+.TP
+.B \-N
+Treat the logfile as being composed of NAT log records.
+.TP
+.B \-S
+Treat the logfile as being composed of state log records.
 .SH DIAGNOSTICS
 \fBipmon\fP expects data that it reads to be consistant with how it should be
 saved and will abort if it fails an assertion which detects an anomoly in the
diff --git a/contrib/ipfilter/man/man.sed b/contrib/ipfilter/man/man.sed
new file mode 100644
index 0000000..0be8dab
--- /dev/null
+++ b/contrib/ipfilter/man/man.sed
@@ -0,0 +1 @@
+DF
.	�..�CVSD~MakefileDipf.1D�ipf.4D�ipf.5D�