Commit Graph

15 Commits

Author SHA1 Message Date
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
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
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
green
4c5e0997f8 Add RCS strings to kernel ipfilter files. 1999-06-19 11:35:41 +00:00
archie
982e80577d Examine all occurrences of sprintf(), strcat(), and str[n]cpy()
for possible buffer overflow problems. Replaced most sprintf()'s
with snprintf(); for others cases, added terminating NUL bytes where
appropriate, replaced constants like "16" with sizeof(), etc.

These changes include several bug fixes, but most changes are for
maintainability's sake. Any instance where it wasn't "immediately
obvious" that a buffer overflow could not occur was made safer.

Reviewed by:	Bruce Evans <bde@zeta.org.au>
Reviewed by:	Matthew Dillon <dillon@apollo.backplane.com>
Reviewed by:	Mike Spengler <mks@networkcs.com>
1998-12-04 22:54:57 +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
darrenr
a93925894f Import version 3.2alpha7 1997-05-25 15:50:46 +00:00