d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
131,584 Commits 6 Branches 133 Tags 2.6 GiB
445eba04a8
Commit Graph

57 Commits

Author SHA1 Message Date
Guido van Rooij
dac098f2c9 Resolve conflicts 
MFC after:	1 weeks
 2006-08-16 12:23:02 +00:00
Guido van Rooij
25508d6cfb Resolve conflicts (and believe me...you don't want to know). 2005-12-30 11:52:26 +00:00
Darren Reed
750e88322f * Someone imported a lot of files with the wrong CVS tag, so lots of files need 
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.
 2005-04-25 18:20:15 +00:00
Darren Reed
3c911a00da This commit was generated by cvs2svn to compensate for changes in r145510, 
which included commits to RCS files with non-trunk default branches.
 2005-04-25 17:31:50 +00:00
Darren Reed
144279dcb8 import ipfilter 4.1.8 into the vendor branch 2005-04-25 17:31:50 +00:00
Darren Reed
0076f43158 Committ changes from 3.4.31 -> 3.4.35 
* fix bug parsing port comparisons in proxy rules
* make parsing errors in ipf/ipnat return an error rather than return
  indicating success.
* make parsing errors in ipf/ipnat return an error rather than return
  indicating success.
* make ipfstat work as a set{g,u}id thing - gave up privs before opening
  /dev/ipl
* fix ipfstat -A
* make "ipfstat -f" output more informative
* various changes to ipsend for sending packets with ipv4 options
* ipmon was not correctly calculating the length of the IPv6 packet (excluded
  ipv6 header length)

MFC:	1 week
 2004-06-21 22:53:03 +00:00
Darren Reed
dfb9a48c69 Import ipfilter 3.4.35 onto vendor branch 2004-06-21 22:47:51 +00:00
Darren Reed
0338547942 This commit was generated by cvs2svn to compensate for changes in r130887, 
which included commits to RCS files with non-trunk default branches.
 2004-06-21 22:47:51 +00:00
Darren Reed
57e3d9cf76 bring changes in IPFilter to 3.4.31 on to the head 2003-02-15 06:32:48 +00:00
Darren Reed
965575f97c Import userland tools for IPFilter 3.4.31 into -current 2003-02-15 06:27:40 +00:00
Darren Reed
50d563d31c This commit was generated by cvs2svn to compensate for changes in r110917, 
which included commits to RCS files with non-trunk default branches.
 2003-02-15 06:27:40 +00:00
Matthew Dillon
48e3128b34 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
Matthew Dillon
cd72f2180b 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
Darren Reed
d37d8bd759 Import IPFilter 3.4.28 2002-06-07 08:58:22 +00:00
Darren Reed
289efc37c0 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
Darren Reed
0261139eb5 resolve conflicts from import 2002-04-25 03:36:26 +00:00
Darren Reed
ce4e47980d Import IPFilter 3.4.26 2002-04-25 03:34:26 +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
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
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
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
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
8312b3f4f7 fix conflicts 2000-05-24 02:19:15 +00:00
Darren Reed
933f6f74ee Import IP Filter 3.4.4 into FreeBSD-current 2000-05-24 02:14:22 +00:00
Darren Reed
5bca461d6f This commit was generated by cvs2svn to compensate for changes in r60841, 
which included commits to RCS files with non-trunk default branches.
 2000-05-24 02:14:22 +00:00
Peter Wemm
0decb68047 Remove files not in the v3_3_8 import. 2000-02-10 05:09:52 +00:00
Peter Wemm
96c630d7b2 Not in this commit: Many spammed deltas have been removed to restore 
back to the vendor branch.

Re-merge changes from the vendor branch.

Undo the local spammed changes that I could find.  There are probably
more local fixes that were clobbered that I've missed.
 2000-02-10 03:17:51 +00:00
Guido van Rooij
23a0caaf86 Import of ipfilter 3.3.6 (freebsd relevant part) 
Obtained from:	ftp://coombs.anu.edu.au/pub/net/firewall/ip-filter/ip_fil3.3.6.tar.gz
 2000-01-13 18:30:37 +00:00
Guido van Rooij
c41766e97e This commit was generated by cvs2svn to compensate for changes in r55924, 
which included commits to RCS files with non-trunk default branches.
 2000-01-13 18:30:37 +00:00
Guido van Rooij
c9bff7ba93 Import of ipfilter 3.3.3 in anticipation of its revival. 
More to come in the next days.
 1999-11-08 20:51:23 +00:00
Guido van Rooij
ee665f5a80 This commit was generated by cvs2svn to compensate for changes in r53024, 
which included commits to RCS files with non-trunk default branches.
 1999-11-08 20:51:23 +00:00
Bill Fumerola
0bda8fea7a remove non-existant references, correct spelling errors. 
PR:		docs/7963, docs/7790
Submitted by:	Stefan Eggers seggers@semyam.dinoco.de
		Norihiro Kumagai kuma@jp.freebsd.org
 1998-12-30 04:09:21 +00:00
Peter Wemm
dd21baedfd Merge 3.2.3 -> 3.2.7 changes into mainline. 1998-06-20 18:43:25 +00:00
Peter Wemm
9b632708fe Import trimmed version of ipfilter 3.2.7. 
Obtained from:  Darren Reed via http://cheops.anu.edu.au/~avalon/
 1998-06-20 18:29:38 +00:00
Peter Wemm
847a1ab264 This commit was generated by cvs2svn to compensate for changes in r37074, 
which included commits to RCS files with non-trunk default branches.
 1998-06-20 18:29:38 +00:00
Steve Price
32c2131395 Fix a bunch of spelling errors. 
PR:		6856
Submitted by:	Josh Gilliam <josh@quick.net>
 1998-06-04 21:06:07 +00:00