darrenr
24d61c1ea6
resolve conflicts
2000-08-13 04:31:06 +00:00
darrenr
9f3624548b
fix conflicts
2000-07-19 14:02:09 +00:00
darrenr
af0a4a0591
fix up conflicts
2000-05-24 04:40:17 +00:00
darrenr
9c90494417
fix conflicts
2000-05-24 04:01:49 +00:00
darrenr
3a99aee60f
fix conflicts
2000-05-24 04:01:30 +00:00
guido
e515e856f2
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
2fb4ae435f
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
de7edf803a
Bring over ipfilter kernel sources, including merging the local modifications.
2000-01-13 19:01:33 +00:00
eivind
0ab244240a
KERNEL -> _KERNEL
2000-01-05 16:25:20 +00:00
guido
75b4f99d65
Add kernel parts of revived ipfilter (3.3.3.)
1999-11-23 21:44:59 +00:00
peter
c5fae33605
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
3b842d34e8
$Id$ -> $FreeBSD$
1999-08-28 01:08:13 +00:00
eivind
da99bd7667
Staticize some more.
1998-11-26 18:54:52 +00:00
bde
d1358702bf
Made some disgusting ifdefs even more disgusting to enable the support
...
for `u_long cmd' ioctl args if __FreeBSD_version >= 300003. Some ioctls
were broken on machines with 32-bit ints and 64-bit longs.
1998-08-15 21:51:53 +00:00
peter
595e4ae373
Merge ipfilter 3.2.3 -> 3.2.7 changes onto mainline.
1998-06-20 18:37:51 +00:00
peter
f3fab3424a
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
peter
c3255d453d
Import kernel parts of ipfilter v3.2.3
1998-03-21 10:11:54 +00:00
peter
7a56344e6a
Import kernel parts of ipfilter-3.2.1
1997-11-16 05:55:52 +00:00
darrenr
a93925894f
Import version 3.2alpha7
1997-05-25 15:50:46 +00:00
darrenr
525015045e
Really import sys/netinet changes for IP Filter 3.2alpha4 this time.
1997-04-03 10:39:35 +00:00
peter
240550ea53
Import ipfilter 3.1.8 kernel components
1997-03-02 15:50:35 +00:00
peter
f0c7769b1f
Replacement import of ipfilter 3.1.7 components used in kernel.
...
(This is to repair the vendor branching)
1997-03-02 15:49:41 +00:00
