actually commit merged diffs to the trunk

3 files changed, 48 insertions, 27 deletions

diff --git a/contrib/ipfilter/INSTALL.xBSD b/contrib/ipfilter/INSTALL.xBSD
new file mode 100644
index 0000000..2f933ff
--- /dev/null
+++ b/contrib/ipfilter/INSTALL.xBSD
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+To build a kernel for use with the loadable kernel module, follow these
+steps:
+	1. do "make bsd"
+
+	2. cd to the "BSD" directory and type "make install"
+
+	3. run "4bsd/minstall" as root
+
+	4. build a new kernel
+
+	5. install and reboot with the new kernel
+
+	6. use modload(8) to load the packet filter with:
+		modload if_ipl.o
+
+	7. do "modstat" to confirm that it has been loaded successfully.
+
+There is no need to use mknod to create the device in /dev;
+- upon loading the module, it will create itself with the correct values,
+  under the name (IPL_NAME) from the Makefile.  It will also remove itself
+  from /dev when it is modunload'd.
+
+To build a kernel with the IP filter, follow these steps:
+
+	1. do "make bsd"
+
+	2. cd to the "BSD" directory and type "make install"
+
+	3. run "4bsd/kinstall" as root
+
+	4. build a new kernel
+
+	5. create devices for IP Filter as follows (assuming it was
+	   installed into the device table as char dev 20):
+		mknod /dev/ipl c 20 0
+		mknod /dev/ipnat c 20 1
+		mknod /dev/ipstate c 20 2
+		mknod /dev/ipauth c 20 3
+
+	6. install and reboot with the new kernel
+
+Darren
+darrenr@pobox.com
diff --git a/contrib/ipfilter/ip_log.c b/contrib/ipfilter/ip_log.c
index aaaefea..0a818ce 100644
--- a/contrib/ipfilter/ip_log.c
+++ b/contrib/ipfilter/ip_log.c
@@ -16,14 +16,9 @@
 # include "opt_ipfilter_log.h"
 #endif
 #ifdef  __FreeBSD__
-# if defined(IPFILTER_LKM) || defined(_KERNEL)
-#  if !defined(__FreeBSD_version) 
-#   include <sys/osreldate.h>
-#  endif
-#  if !defined(IPFILTER_LKM)
-#   if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
-#    include "opt_ipfilter.h"
-#   endif
+# if defined(_KERNEL) && !defined(IPFILTER_LKM)
+#  if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#   include "opt_ipfilter.h"
 #  endif
 # else
 #  ifdef KLD_MODULE
diff --git a/contrib/ipfilter/linux.h b/contrib/ipfilter/linux.h
deleted file mode 100644
index 61fd821..0000000
--- a/contrib/ipfilter/linux.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 1993-1998 by Darren Reed.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and due credit is given
- * to the original author and the contributors.  The author accepts no
- * responsibility and is not changed in any way.
- *
- * I hate legaleese, don't you ?
- * $Id: linux.h,v 2.1 1999/08/04 17:30:10 darrenr Exp $
- */
-
-#include <linux/config.h>
-#ifdef MODULE
-#include <linux/module.h>
-#include <linux/version.h>
-#endif /* MODULE */
-
-#include "ip_compat.h"