Darren Reed
649a43212c
fix "ipf -Z" reporting rubbish and possibly panic'ing box
...
MFC after: 4 days
2006-04-18 13:24:14 +00:00
Darren Reed
94341e74d5
Add a man page for mkfilters(1) and put the corrected perl script in the
...
ipfilter usr/share directory
PR: docs/26879
2006-02-27 11:22:20 +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
Guido van Rooij
e246b3be6f
Import IP Filter 4.1.10
2005-12-30 11:34:54 +00:00
Guido van Rooij
855921cec5
This commit was generated by cvs2svn to compensate for changes in r153877,
...
which included commits to RCS files with non-trunk default branches.
2005-12-30 11:34:54 +00:00
Darren Reed
0e6e3d9f1c
Remove these files from src/contrib/ipfilter as they are already present
...
in src/sys/contrib/ipfilter/netinet. Makefile's reachover bits find what
they need so building is unaffected.
Approved by: re (dwhite)
2005-06-23 14:22:02 +00:00
Darren Reed
721c3c7cc6
Fix some minor problems before release:
...
(1) "ipf -T" is broken for fetching single entries and
(2) loading rules with numbered collections does not order insertion right.
(3) stats aren't accumulated for hash table memory failures
Approved by: re (dwhite)
2005-06-23 14:19:02 +00:00
Eivind Eklund
466aa63579
Since this is already off the vendor branch: Our kernel is now in
...
/boot/kernel/kernel, not plain /kernel
2005-05-27 01:09:42 +00:00
Olivier Houchard
6ffb8d33c7
arm defaults to unsigned char as well.
2005-05-24 21:25:32 +00:00
Darren Reed
051adc35a2
Enable building /sbin/ipf (but not the rescue version) with the ability to
...
parse bpf strings for filter rules in ipf.conf
2005-05-16 16:22:55 +00:00
Peter Grehan
9fce4d1d91
Fix tinderbox build on ppc.
...
Requested by: mlaier
2005-05-08 00:29:15 +00:00
Darren Reed
e01de6cda3
Don't use quad_t on FreeBSD (deprecated) so use "long long" instead.
...
Someday this should be converted to uint64_t and printstate.c changed to
use those horrid PRiud64 things.
2005-04-28 21:36:30 +00:00
Darren Reed
cf4ee2c933
Patches from Ruslam Ermilov to remove NetBSD bits from Makefiles and cleanup
...
build problems with rescue.
2005-04-28 16:26:35 +00:00
Darren Reed
dfb07485de
Fix include directives that were missing the netinet include directory, where
...
the ipl.h file is found. Also add back in ip_fil.c, which somehow went missing
in action.
2005-04-26 15:18:45 +00:00
Darren Reed
984f8800d4
Missing file from vendor branch import.
2005-04-26 14:59:26 +00:00
Darren Reed
eaa8e3e8c5
Fix problems with building libipf:
...
ipf_dontuning.c - change the include to look in netinet for ipl.h
ipft_tx.c - make the private use of arrays with tcp flags info in them more
not use names that can be "confusing"
2005-04-26 14:27:12 +00:00
Darren Reed
0eb958a2b7
this file does not belong in a freebsd distribution
2005-04-25 19:15:19 +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
74708a0492
these files should never have been imported...they are junk
2005-04-25 17:40:37 +00:00
Darren Reed
83b71dcb90
This commit was generated by cvs2svn to compensate for changes in r145513,
...
which included commits to RCS files with non-trunk default branches.
2005-04-25 17:40:37 +00:00
Darren Reed
144279dcb8
import ipfilter 4.1.8 into the vendor branch
2005-04-25 17:31:50 +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
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
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
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
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
14f80d3d7b
Import of ipfilter 3.3.8
...
Approved by: jkh
2000-02-09 20:46:45 +00:00
Guido van Rooij
0f94bd564f
This commit was generated by cvs2svn to compensate for changes in r57093,
...
which included commits to RCS files with non-trunk default branches.
2000-02-09 20:46:45 +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