Commit Graph

125 Commits

Author SHA1 Message Date
guido
7ee0924750 Resolve conflicts (and believe me...you don't want to know). 2005-12-30 11:52:26 +00:00
guido
530bf89f14 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
guido
9749beb9e3 Import IP Filter 4.1.10 2005-12-30 11:34:54 +00:00
darrenr
529d7c08ef 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
darrenr
22c343ffc8 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
e998be30e5 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
cognet
8f10c3fc8a arm defaults to unsigned char as well. 2005-05-24 21:25:32 +00:00
darrenr
7b001e5d5e 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
grehan
e9af45b288 Fix tinderbox build on ppc.
Requested by:  mlaier
2005-05-08 00:29:15 +00:00
darrenr
a57939d5ce 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
darrenr
f739412edd Patches from Ruslam Ermilov to remove NetBSD bits from Makefiles and cleanup
build problems with rescue.
2005-04-28 16:26:35 +00:00
darrenr
c7e59108a8 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
darrenr
b8892e0b0c Missing file from vendor branch import. 2005-04-26 14:59:26 +00:00
darrenr
6941302010 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
darrenr
671e5d7cb6 this file does not belong in a freebsd distribution 2005-04-25 19:15:19 +00:00
darrenr
d643bc9db0 * 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
darrenr
bf14e64afe these files should never have been imported...they are junk 2005-04-25 17:40:37 +00:00
darrenr
15f9876206 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
darrenr
d438802dcb import ipfilter 4.1.8 into the vendor branch 2005-04-25 17:31:50 +00:00
darrenr
1c27d898b4 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
darrenr
a444d606d5 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
darrenr
590450fec6 Import ipfilter 3.4.35 onto vendor branch 2004-06-21 22:47:51 +00:00
darrenr
ac063842a5 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
588931c924 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
244f075414 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
5c7716ee9f 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
darrenr
72ec972c34 update man page to reflect change in default syslog level ipmon is now compiled with 2003-04-05 21:12:58 +00:00
darrenr
20b8c1f5c4 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
darrenr
e818bd682c bring changes in IPFilter to 3.4.31 on to the head 2003-02-15 06:32:48 +00:00
darrenr
bb1b56a0d0 Import userland tools for IPFilter 3.4.31 into -current 2003-02-15 06:27:40 +00:00
darrenr
cd8fb83e1f 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
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
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
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
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