Commit graph

84 commits

Author SHA1 Message Date
Darren Reed ab45c4a6f4 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
Darren Reed a5b879f8a3 Import 3.4.27 2002-04-27 17:01:32 +00:00
Darren Reed 6f6de10640 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
Darren Reed accfbf9e7c Import 3.4.27 2002-04-27 17:01:31 +00:00
Darren Reed 0261139eb5 resolve conflicts from import 2002-04-25 03:36:26 +00:00
Darren Reed 1a1e221318 Import IPFilter 3.4.26 2002-04-25 03:34:27 +00:00
Darren Reed e225a96a93 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
Darren Reed ce4e47980d Import IPFilter 3.4.26 2002-04-25 03:34:26 +00:00
Darren Reed 1192f4fd9c 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
Ruslan Ermilov 43c1371d7a 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
Darren Reed 95ca00720d 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
Darren Reed 8617526df1 remove because of licence reasons 2002-03-19 15:13:27 +00:00
Darren Reed 68d1243587 fix conflicts generated by import, completing import of ipf3.4.25 2002-03-19 11:48:16 +00:00
Darren Reed 0868380a54 Import IPFilter 3.4.25 2002-03-19 11:45:24 +00:00
Darren Reed 0df2c61f4f 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
Darren Reed d564cc784f Import IPFilter 3.4.25 2002-03-19 11:45:20 +00:00
Darren Reed f371049810 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 Perlstein ff3ec7455e Backout inclusion of sys/queue.h 2002-01-14 09:19:18 +00:00
Alfred Perlstein a40d159b40 add queue.h, now needed for file.h 2002-01-14 04:12:54 +00:00
Bruce Evans 62601deb33 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
Bruce Evans 6eabd84580 Compensate for "Compensate for header dethreading" by backing it out. 2001-10-10 17:48:44 +00:00
Darren Reed 7d2bc5ce77 fix conflicts created by import 2001-07-28 12:08:15 +00:00
Darren Reed dba82da1c8 Import IPFilter version 3.4.20 2001-07-28 11:59:33 +00:00
Darren Reed 7d3ce0223a 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
Darren Reed dd298e2f03 Import IPFilter version 3.4.20 2001-07-28 11:59:32 +00:00
Darren Reed 56ff60d17c 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
Ruslan Ermilov 7879537eee Removed duplicate copies of files already present in sys/contrib/ipfilter.
Not objected to by:	-arch
2001-06-18 15:54:04 +00:00
Mark Murray 2888dd72bf 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
Darren Reed f590526d0a fix conflicts 2001-02-04 14:26:56 +00:00
Darren Reed 84822a3b55 Import IP Filter update 2001-02-04 14:25:38 +00:00
Darren Reed ddd584a728 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 Perlstein 5af128b21e Adapt to new struct kinfo_proc and unbreak world.
Apologies to: darrenr who is maintainer
2000-12-14 23:35:57 +00:00
Darren Reed c91fbe3bb4 fix conflicts created by import 2000-10-29 08:08:32 +00:00
Darren Reed 801aabae69 Import IP Filter 3.4.13 into src/contrib, not src/contirb 2000-10-29 08:07:08 +00:00
Darren Reed 2bd1292fe1 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
Darren Reed 33fe2fbd37 fix conflicts from rcsids 2000-10-26 12:47:40 +00:00
Darren Reed 7aba7e7040 Import IP Filter 3.4.12 2000-10-26 12:45:54 +00:00
Darren Reed c5de53b9a7 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
Darren Reed 561e006b67 resolve conflicts 2000-08-13 05:00:44 +00:00
Darren Reed f345cd2b83 Import base ipfilter 3.4.9 into contrib dir. 2000-08-13 04:58:02 +00:00
Darren Reed 3002dee911 This commit was generated by cvs2svn to compensate for changes in r64588,
which included commits to RCS files with non-trunk default branches.
2000-08-13 04:58:02 +00:00
Darren Reed 23053d8f2f actually commit merged diffs to the trunk 2000-07-19 23:10:29 +00:00
Archie Cobbs 75da303298 Fix breakage caused by ether_aton() prototype change.
PR:		bin/20033
2000-07-19 16:30:02 +00:00
Darren Reed c0230397c7 fix conflicts 2000-07-19 13:56:18 +00:00
Darren Reed 02aea5e854 Import v3.4.8 into -current 2000-07-19 13:52:47 +00:00
Darren Reed 83a94a22b3 This commit was generated by cvs2svn to compensate for changes in r63516,
which included commits to RCS files with non-trunk default branches.
2000-07-19 13:52:47 +00:00
Darren Reed 6de9811ef7 define CSUM_DELAY_DATA to match merge 2000-05-26 07:28:03 +00:00
Darren Reed f1beb78299 fix up #ifdef jungle for FreeBSD 2000-05-25 16:24:46 +00:00
Darren Reed 6774c05335 remove duplicate prototypes 2000-05-25 16:23:30 +00:00
Darren Reed 8312b3f4f7 fix conflicts 2000-05-24 02:19:15 +00:00