Commit Graph

22 Commits

Author SHA1 Message Date
darrenr
48b4ca8e6a fix conflicts 2001-02-04 14:26:56 +00:00
darrenr
d18ce92d58 activate pfil_hooks and covert ipfilter to use it 2000-07-31 13:11:42 +00:00
darrenr
9f3624548b fix conflicts 2000-07-19 14:02:09 +00:00
darrenr
8e62250edd remove duplicate prototypes 2000-05-25 16:23:30 +00:00
darrenr
9c26b06dba fix conflicts 2000-05-24 03:43:24 +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
e66131d414 Apply patches in rev 1.2 and 1.9 that I forgot
Pointe out by:	bde
2000-01-14 19:48:42 +00:00
guido
de7edf803a Bring over ipfilter kernel sources, including merging the local modifications. 2000-01-13 19:01:33 +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
peter
595e4ae373 Merge ipfilter 3.2.3 -> 3.2.7 changes onto mainline. 1998-06-20 18:37:51 +00:00
bde
566ee5c323 Fixed pedantic semantics errors (bitfields not of type int, signed int
or unsigned int (this doesn't change the struct layout, size or
alignment in any of the files changed in this commit, at least for
gcc on i386's.  Using bitfields of type u_char may affect size and
alignment but not packing)).
1998-06-08 09:47:47 +00:00
bde
0801d7c827 ip_fil.h has 9 separate declarations of iplioctl() in a disgusting
ifdef tangle.  The previous commit to ip_fil.h didn't change the
one that actually applies to the current FreeBSD kernel, of course.
Fixed.

Fixed style bugs in previous commit to ip_fil.h.
1998-06-08 06:04:12 +00:00
dfr
1d5f38ac22 This commit fixes various 64bit portability problems required for
FreeBSD/alpha.  The most significant item is to change the command
argument to ioctl functions from int to u_long.  This change brings us
inline with various other BSD versions.  Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.

The prototype FreeBSD/alpha machdep will follow in a couple of days
time.
1998-06-07 17:13:14 +00:00
peter
6858636bc2 Some patchups for when this code is compiled in userland (!). 1998-03-21 13:37:44 +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
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