Import IPFilter 3.3.9. Primarily, bugfixes since 3.3.8. See sbin/ipf/HISTORY

for details.

14 files changed, 37 insertions, 14 deletions

diff --git a/sbin/ipf/HISTORY b/sbin/ipf/HISTORY
index 0812e373b33..f9111baf003 100644
--- a/sbin/ipf/HISTORY
+++ b/sbin/ipf/HISTORY
@@ -1,4 +1,4 @@
-#	$OpenBSD: HISTORY,v 1.3 2000/02/01 19:29:59 kjell Exp $
+#	$OpenBSD: HISTORY,v 1.4 2000/02/16 22:34:21 kjell Exp $
 #
 # NOTE: Quite a few patches and suggestions come from other sources, to whom
 #       I'm greatly indebted, even if no names are mentioned.
@@ -21,6 +21,29 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+3.3.9	15/02/2000 - Released
+
+fix scheduling of bad locking in fr_addstate() used when we attach onto
+a filter rule.
+
+fix up ip_statesync() with storing interface names in ipstate_t
+
+fix fr_running for LKM's - Eugene Polovnikov
+
+junk using pullupmsg() for solaris - it's next to useless for what we
+need to do here anyway - and implement what we require.
+
+don't call fr_delstate() in fr_checkstate(), when compiled for a user
+program, early but when we're finished with it (got fr & pass)
+
+ipnat(5) fix from Guido
+
+on solaris2, copy message and use that with filter if there is another
+copy if it being used (db_ref > 1).  bad for performance, but better
+than causing a crash.
+
+patch for solaris8-fcs compile from Casper Dik
+
 3.3.8	01/02/2000 - Released
 
 fix state handling of SYN packets.
diff --git a/sbin/ipf/facpri.c b/sbin/ipf/facpri.c
index 4c866ca3698..9801ce875fc 100644
--- a/sbin/ipf/facpri.c
+++ b/sbin/ipf/facpri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: facpri.c,v 1.2 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: facpri.c,v 1.3 2000/02/16 22:34:21 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipf/facpri.h b/sbin/ipf/facpri.h
index 1d29c4ba82e..d340c9fa3b5 100644
--- a/sbin/ipf/facpri.h
+++ b/sbin/ipf/facpri.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: facpri.h,v 1.2 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: facpri.h,v 1.3 2000/02/16 22:34:21 kjell Exp $	*/
 
 /*
  * Copyright (C) 1999 by Darren Reed.
diff --git a/sbin/ipf/ifaddr.c b/sbin/ipf/ifaddr.c
index 832ca4e4cf8..e9ed65f5239 100644
--- a/sbin/ipf/ifaddr.c
+++ b/sbin/ipf/ifaddr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifaddr.c,v 1.2 2000/02/01 19:30:00 kjell Exp $ */
+/* $OpenBSD: ifaddr.c,v 1.3 2000/02/16 22:34:21 kjell Exp $ */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/sbin/ipf/ifaddr.h b/sbin/ipf/ifaddr.h
index 19f77d05926..054f957c934 100644
--- a/sbin/ipf/ifaddr.h
+++ b/sbin/ipf/ifaddr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifaddr.h,v 1.2 2000/02/01 19:30:00 kjell Exp $ */
+/* $OpenBSD: ifaddr.h,v 1.3 2000/02/16 22:34:21 kjell Exp $ */
 
 #ifndef        __IFADDR_H__
 #define        __IFADDR_H__
diff --git a/sbin/ipf/ipf.c b/sbin/ipf/ipf.c
index 02c43d9177b..e3fe71acae6 100644
--- a/sbin/ipf/ipf.c
+++ b/sbin/ipf/ipf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipf.c,v 1.21 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: ipf.c,v 1.22 2000/02/16 22:34:21 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipf/ipf.h b/sbin/ipf/ipf.h
index 30e3329eb18..799f5608569 100644
--- a/sbin/ipf/ipf.h
+++ b/sbin/ipf/ipf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipf.h,v 1.12 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: ipf.h,v 1.13 2000/02/16 22:34:21 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipf/opt.c b/sbin/ipf/opt.c
index 3e384d68c5a..334f4596c27 100644
--- a/sbin/ipf/opt.c
+++ b/sbin/ipf/opt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opt.c,v 1.12 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: opt.c,v 1.13 2000/02/16 22:34:21 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipf/parse.c b/sbin/ipf/parse.c
index 7cad35c146a..c8e29f9523d 100644
--- a/sbin/ipf/parse.c
+++ b/sbin/ipf/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.31 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: parse.c,v 1.32 2000/02/16 22:34:21 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipfstat/fils.c b/sbin/ipfstat/fils.c
index 67ec78629f0..65bfc9713cb 100644
--- a/sbin/ipfstat/fils.c
+++ b/sbin/ipfstat/fils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fils.c,v 1.18 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: fils.c,v 1.19 2000/02/16 22:34:22 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipfstat/kmem.c b/sbin/ipfstat/kmem.c
index b56fa34ee32..b80807fac4a 100644
--- a/sbin/ipfstat/kmem.c
+++ b/sbin/ipfstat/kmem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kmem.c,v 1.13 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: kmem.c,v 1.14 2000/02/16 22:34:22 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipfstat/kmem.h b/sbin/ipfstat/kmem.h
index 9d8e7cee3af..f14d5ab78f8 100644
--- a/sbin/ipfstat/kmem.h
+++ b/sbin/ipfstat/kmem.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kmem.h,v 1.10 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: kmem.h,v 1.11 2000/02/16 22:34:22 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipnat/ipnat.c b/sbin/ipnat/ipnat.c
index 70774ba9f92..60ac2d9d7c3 100644
--- a/sbin/ipnat/ipnat.c
+++ b/sbin/ipnat/ipnat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipnat.c,v 1.34 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: ipnat.c,v 1.35 2000/02/16 22:34:22 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/sbin/ipnat/natparse.c b/sbin/ipnat/natparse.c
index 40204a429e5..f4aa48153ac 100644
--- a/sbin/ipnat/natparse.c
+++ b/sbin/ipnat/natparse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natparse.c,v 1.2 2000/02/01 19:30:00 kjell Exp $	*/
+/*	$OpenBSD: natparse.c,v 1.3 2000/02/16 22:34:22 kjell Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.