16 Commits

Author	SHA1	Message	Date
Darren Reed	f590526d0a	fix conflicts	2001-02-04 14:26:56 +00:00
Darren Reed	0c72e2855d	Fix conflicts creted by import.	2000-10-29 07:53:05 +00:00
Darren Reed	60b88d9681	fix conflicts from rcsids	2000-10-26 12:33:42 +00:00
Darren Reed	5e90b39cba	resolve conflicts	2000-08-13 04:31:06 +00:00
Darren Reed	72130853fb	fix conflicts	2000-07-19 14:02:09 +00:00
Darren Reed	6e067727a7	fix up conflicts	2000-05-24 04:40:17 +00:00
Guido van Rooij	a993ad154a	Re add rev 1.11 diffs to ip_fil.h Also discover that I did not undefine ... CVS_FUBAR (which no longer exists) and thus forgot to add $FreeBSD's. Add them. Approved by: jkh (is part of ipfilter upgrade)	2000-02-10 21:29:11 +00:00
Guido van Rooij	6cd756a2b5	Bring over ipfilter v3_3_8 kernel sources, including merging the ... local modifications. Also fix initializing fr_running in KLD case. Rename ipl_inited to fr_runninhg in mlfk_ipl Approved by: jkh	2000-02-09 20:56:36 +00:00
Guido van Rooij	0f9f7e9f23	Bring over ipfilter kernel sources, including merging the local modifications.	2000-01-13 19:01:33 +00:00
Guido van Rooij	9cc86ee930	Add kernel parts of revived ipfilter (3.3.3.)	1999-11-23 21:44:59 +00:00
Peter Wemm	088f7c5d38	Nuke the old antique copy of ipfilter from the tree. This is old enough ... to be dangerous. It will better serve us as a port building a KLD, ala SKIP. The hooks are staying although it would be better to port and use the NetBSD pfil interface rather than have custom hooks.	1999-10-10 15:09:59 +00:00
Peter Wemm	c3aac50f28	$Id$ -> $FreeBSD$	1999-08-28 01:08:13 +00:00
Brian Feldman	ebe119ae6c	Add RCS strings to kernel ipfilter files.	1999-06-19 11:35:41 +00:00
Peter Wemm	aeee047f95	Import ipfilter 3.2.7 kernel components	1998-06-20 18:18:05 +00:00
Peter Wemm	27064bb159	Import kernel parts of ipfilter v3.2.3	1998-03-21 10:11:54 +00:00
Darren Reed	e10102a12a	Import version 3.2alpha7	1997-05-25 15:50:46 +00:00