dillon
ccd5574cc6
Bow to the whining masses and change a union back into void *. Retain
...
removal of unnecessary casts and throw in some minor cleanups to see if
anyone complains, just for the hell of it.
2003-01-13 00:33:17 +00:00
dillon
ddf9ef103e
Change struct file f_data to un_data, a union of the correct struct
...
pointer types, and remove a huge number of casts from code using it.
Change struct xfile xf_data to xun_data (ABI is still compatible).
If we need to add a #define for f_data and xf_data we can, but I don't
think it will be necessary. There are no operational changes in this
commit.
2003-01-12 01:37:13 +00:00
darrenr
b6c99dc12d
merge the changes from 3.4.29 that didn't go cleanly due to conflicts
2002-08-28 13:45:36 +00:00
darrenr
694c267c8d
This commit was generated by cvs2svn to compensate for changes in r102521,
...
which included commits to RCS files with non-trunk default branches.
2002-08-28 13:42:48 +00:00
darrenr
3aab5fb9fd
With a bit of luck, this will be a first-time right import of ipfilter 3.4.29
...
on to the vendor branch.
2002-08-28 13:42:48 +00:00
darrenr
9765382011
Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28
2002-06-07 09:01:41 +00:00
darrenr
29738d8f27
Import IPFilter 3.4.28
2002-06-07 08:58:26 +00:00
darrenr
221a9f73d4
This commit was generated by cvs2svn to compensate for changes in r98008,
...
which included commits to RCS files with non-trunk default branches.
2002-06-07 08:58:26 +00:00
darrenr
18c772ae03
Import IPFilter 3.4.28
2002-06-07 08:58:22 +00:00
darrenr
05bc20a37a
This commit was generated by cvs2svn to compensate for changes in r98005,
...
which included commits to RCS files with non-trunk default branches.
2002-06-07 08:58:22 +00:00
darrenr
f1f224e765
Import 3.4.27
2002-04-27 17:01:32 +00:00
darrenr
5cd1f09afc
This commit was generated by cvs2svn to compensate for changes in r95567,
...
which included commits to RCS files with non-trunk default branches.
2002-04-27 17:01:32 +00:00
darrenr
eaeeda31ab
Import 3.4.27
2002-04-27 17:01:31 +00:00
darrenr
3d314d26ef
This commit was generated by cvs2svn to compensate for changes in r95565,
...
which included commits to RCS files with non-trunk default branches.
2002-04-27 17:01:31 +00:00
darrenr
960bcab6dc
resolve conflicts from import
2002-04-25 03:36:26 +00:00
darrenr
2cd87c1dd8
Import IPFilter 3.4.26
2002-04-25 03:34:27 +00:00
darrenr
55f03cec97
This commit was generated by cvs2svn to compensate for changes in r95421,
...
which included commits to RCS files with non-trunk default branches.
2002-04-25 03:34:27 +00:00
darrenr
49c8a23224
Import IPFilter 3.4.26
2002-04-25 03:34:26 +00:00
darrenr
e783fd269e
This commit was generated by cvs2svn to compensate for changes in r95419,
...
which included commits to RCS files with non-trunk default branches.
2002-04-25 03:34:26 +00:00
ru
35f8225fa6
Removed (new in 3.4.25 import) duplicate copies of files already present
...
in sys/contrib/ipfilter.
2002-03-26 13:44:40 +00:00
darrenr
c4ba564b6d
For this regression test to pass, you must run ipmon in the Australia/Victoria
...
(EST-10) timezone to generate the correct timestamps in output.
2002-03-19 15:17:06 +00:00
darrenr
3f7f80f124
remove because of licence reasons
2002-03-19 15:13:27 +00:00
darrenr
c981967451
fix conflicts generated by import, completing import of ipf3.4.25
2002-03-19 11:48:16 +00:00
darrenr
8753e713f5
Import IPFilter 3.4.25
2002-03-19 11:45:24 +00:00
darrenr
fc5e0bb536
This commit was generated by cvs2svn to compensate for changes in r92688,
...
which included commits to RCS files with non-trunk default branches.
2002-03-19 11:45:24 +00:00
darrenr
5df9698551
Import IPFilter 3.4.25
2002-03-19 11:45:20 +00:00
darrenr
3140c087b9
This commit was generated by cvs2svn to compensate for changes in r92686,
...
which included commits to RCS files with non-trunk default branches.
2002-03-19 11:45:20 +00:00
alfred
df4981173c
Backout inclusion of sys/queue.h
2002-01-14 09:19:18 +00:00
alfred
d096a8fe20
add queue.h, now needed for file.h
2002-01-14 04:12:54 +00:00
bde
b2d7aa6d5d
Fixed corruption of the vendor $Id$ to $FreeBSD$. Put $FreeBSD$ in
...
__FBSDID() and ifdefed away all vendor id stuff.
This file should never have left the vendor branch; it is now identical
with the vendor's version except for id fiddling.
2001-10-12 15:05:00 +00:00
bde
229c3ac7c3
Compensate for "Compensate for header dethreading" by backing it out.
2001-10-10 17:48:44 +00:00
darrenr
453a967eab
fix conflicts created by import
2001-07-28 12:08:15 +00:00
darrenr
c51cd1facc
Import IPFilter version 3.4.20
2001-07-28 11:59:33 +00:00
darrenr
99e3b6df83
This commit was generated by cvs2svn to compensate for changes in r80486,
...
which included commits to RCS files with non-trunk default branches.
2001-07-28 11:59:33 +00:00
darrenr
c32397cc6e
Import IPFilter version 3.4.20
2001-07-28 11:59:32 +00:00
darrenr
8c6429f93e
This commit was generated by cvs2svn to compensate for changes in r80484,
...
which included commits to RCS files with non-trunk default branches.
2001-07-28 11:59:32 +00:00
ru
227ce6056b
Removed duplicate copies of files already present in sys/contrib/ipfilter.
...
Not objected to by: -arch
2001-06-18 15:54:04 +00:00
markm
3bf4bc0b71
Compensate for dethreaded headers.
...
(I have no religion about how this was done. Follow-up commits welcome)
2001-05-01 09:02:06 +00:00
darrenr
48b4ca8e6a
fix conflicts
2001-02-04 14:26:56 +00:00
darrenr
5e62aa9b3d
Import IP Filter update
2001-02-04 14:25:38 +00:00
darrenr
53b25e2c4c
This commit was generated by cvs2svn to compensate for changes in r72003,
...
which included commits to RCS files with non-trunk default branches.
2001-02-04 14:25:38 +00:00
alfred
4527b5166f
Adapt to new struct kinfo_proc and unbreak world.
...
Apologies to: darrenr who is maintainer
2000-12-14 23:35:57 +00:00
darrenr
5d70b50283
fix conflicts created by import
2000-10-29 08:08:32 +00:00
darrenr
77a62e2a58
Import IP Filter 3.4.13 into src/contrib, not src/contirb
2000-10-29 08:07:08 +00:00
darrenr
9b0fb03ebc
This commit was generated by cvs2svn to compensate for changes in r67855,
...
which included commits to RCS files with non-trunk default branches.
2000-10-29 08:07:08 +00:00
darrenr
19fc1404db
fix conflicts from rcsids
2000-10-26 12:47:40 +00:00
darrenr
7595d5ffce
Import IP Filter 3.4.12
2000-10-26 12:45:54 +00:00
darrenr
e2c5762cd8
This commit was generated by cvs2svn to compensate for changes in r67615,
...
which included commits to RCS files with non-trunk default branches.
2000-10-26 12:45:54 +00:00
darrenr
100a11733c
resolve conflicts
2000-08-13 05:00:44 +00:00
darrenr
54a2153765
Import base ipfilter 3.4.9 into contrib dir.
2000-08-13 04:58:02 +00:00