mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-23 11:18:54 +00:00
Code Issues Releases Activity
108,816 Commits 339 Branches 3,553 Tags 2.1 GiB
996b2c82ca
Commit Graph

105 Commits

Author SHA1 Message Date
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
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
dfb9a48c69 Import ipfilter 3.4.35 onto vendor branch 2004-06-21 22:47:51 +00:00
Guido van Rooij
6b11e29d1e if_name and if_unit renaming to if_xname should be dealth with in 
ipmon as well.
 2004-01-02 13:10:47 +00:00
Brooks Davis
352ec47813 This is a direct commit to the vendor branch with code from the vendor. 
Replace the if_name and if_unit members of struct ifnet with new members
if_xname, if_dname, and if_dunit. if_xname is the name of the interface
and if_dname/unit are the driver name and instance.

This change paves the way for interface renaming and enhanced pseudo
device creation and configuration symantics.

Submitted by:	darrenr
Approved by:	re (scottl)
 2003-12-02 18:33:36 +00:00
Brooks Davis
a66a98a597 This commit was generated by cvs2svn to compensate for changes in r123109, 
which included commits to RCS files with non-trunk default branches.
 2003-12-02 18:33:36 +00:00
Darren Reed
6ad5053781 update man page to reflect change in default syslog level ipmon is now compiled with 2003-04-05 21:12:58 +00:00
Darren Reed
3987f181d5 Change the default syslog facility from LOG_LOCAL0 to LOG_SECURITY after 
discussion on security@freebsd.org.
 2003-04-05 09:25:19 +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
e7413bff80 merge the changes from 3.4.29 that didn't go cleanly due to conflicts 2002-08-28 13:45:36 +00:00
Darren Reed
f7a96e18f1 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
Darren Reed
14ba107c16 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
Darren Reed
edf0752ebe Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28 2002-06-07 09:01:41 +00:00
Darren Reed
a8e3e73627 Import IPFilter 3.4.28 2002-06-07 08:58:26 +00:00
Darren Reed
47ec634d3e 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
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
a5b879f8a3 Import 3.4.27 2002-04-27 17:01:32 +00:00
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
accfbf9e7c Import 3.4.27 2002-04-27 17:01:31 +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
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