5e90b39cba
resolve conflicts
2000-08-13 04:31:06 +00:00
72130853fb
fix conflicts
2000-07-19 14:02:09 +00:00
f1beb78299
fix up #ifdef jungle for FreeBSD
2000-05-25 16:24:46 +00:00
6e067727a7
fix up conflicts
2000-05-24 04:40:17 +00:00
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
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
0f9f7e9f23
Bring over ipfilter kernel sources, including merging the local modifications.
2000-01-13 19:01:33 +00:00
47e3b8ce13
Get rid of useless osreldate include for KLD/LKM modules (sys/param.h
...
already carries what is needed).
This is needed for the KLD support.
1999-11-23 22:16:41 +00:00
9cc86ee930
Add kernel parts of revived ipfilter (3.3.3.)
1999-11-23 21:44:59 +00:00
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
c3aac50f28
$Id$ -> $FreeBSD$
1999-08-28 01:08:13 +00:00
f1d19042b0
The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static
...
and local variables, goto labels, and functions declared but not defined.
1998-12-07 21:58:50 +00:00
29be051d68
Staticize some more.
1998-11-26 18:54:52 +00:00
9f7d4611b3
Use read_random()
1998-04-06 11:40:42 +00:00
e1ddf71b7b
Make it compile.. missing "opt_ipfilter.h" and missing <sys/malloc.h>
1998-03-21 14:42:45 +00:00
1ee25934a9
Make this compile.. There are some unpleasing hacks in here.
...
A major unifdef session is sorely tempting but would destroy any remaining
chance of tracking the original sources.
1998-03-21 11:34:28 +00:00
27064bb159
Import kernel parts of ipfilter v3.2.3
1998-03-21 10:11:54 +00:00
52aef1787c
Import kernel parts of ipfilter-3.2.1
1997-11-16 05:55:52 +00:00
Darren Reed
Guido van Rooij
Peter Wemm
Archie Cobbs
Eivind Eklund
Poul-Henning Kamp