62 Commits

Author SHA1 Message Date
qingli
ec826ad5c7 This main goals of this project are:
1. separating L2 tables (ARP, NDP) from the L3 routing tables
2. removing as much locking dependencies among these layers as
   possible to allow for some parallelism in the search operations
3. simplify the logic in the routing code,

The most notable end result is the obsolescent of the route
cloning (RTF_CLONING) concept, which translated into code reduction
in both IPv4 ARP and IPv6 NDP related modules, and size reduction in
struct rtentry{}. The change in design obsoletes the semantics of
RTF_CLONING, RTF_WASCLONE and RTF_LLINFO routing flags. The userland
applications such as "arp" and "ndp" have been modified to reflect
those changes. The output from "netstat -r" shows only the routing
entries.

Quite a few developers have contributed to this project in the
past: Glebius Smirnoff, Luigi Rizzo, Alessandro Cerri, and
Andre Oppermann. And most recently:

- Kip Macy revised the locking code completely, thus completing
  the last piece of the puzzle, Kip has also been conducting
  active functional testing
- Sam Leffler has helped me improving/refactoring the code, and
  provided valuable reviews
- Julian Elischer setup the perforce tree for me and has helped
  me maintaining that branch before the svn conversion
2008-12-15 06:10:57 +00:00
darrenr
49ad2adb91 2020447 IPFilter's NAT can undo name server random port selection
Approved by:	darrenr
MFC after:	1 week
Security:	CERT VU#521769
2008-07-24 12:35:05 +00:00
des
4cb5c18630 For unfathomable reasons, ipfilter abuses kernel data structures for its
own purposes.  To pull this off, it defines _KERNEL before including the
headers where these structures are defined.  This leads to no end of
trouble when some of these headers, or other headers that they include,
change, as demonstrated by r180755.

The quick fix in this particular case is to define _WANT_FILE instead of
_KERNEL, conditional on __FreeBSD__.  A better long-term fix is left as
an exercise to the reader.
2008-07-23 16:34:53 +00:00
darrenr
fd172ed327 Pullup IPFilter 4.1.28 from the vendor branch into HEAD.
MFC after:	7 days
2007-10-18 21:52:14 +00:00
darrenr
a33069b532 Merge IPFilter 4.1.23 back to HEAD
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13
2007-06-04 02:54:36 +00:00
guido
e49049679f Resolve conflicts
MFC after:	1 weeks
2006-08-16 12:23:02 +00:00
guido
7ee0924750 Resolve conflicts (and believe me...you don't want to know). 2005-12-30 11:52:26 +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
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
d438802dcb import ipfilter 4.1.8 into the vendor branch 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
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
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
960bcab6dc resolve conflicts from import 2002-04-25 03:36:26 +00:00
darrenr
49c8a23224 Import IPFilter 3.4.26 2002-04-25 03:34:26 +00:00
darrenr
c981967451 fix conflicts generated by import, completing import of ipf3.4.25 2002-03-19 11:48:16 +00:00
darrenr
5df9698551 Import IPFilter 3.4.25 2002-03-19 11:45:20 +00:00
darrenr
3140c087b9 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
df4981173c Backout inclusion of sys/queue.h 2002-01-14 09:19:18 +00:00
alfred
d096a8fe20 add queue.h, now needed for file.h 2002-01-14 04:12:54 +00:00
bde
b2d7aa6d5d 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
bde
229c3ac7c3 Compensate for "Compensate for header dethreading" by backing it out. 2001-10-10 17:48:44 +00:00
darrenr
453a967eab fix conflicts created by import 2001-07-28 12:08:15 +00:00
darrenr
c51cd1facc Import IPFilter version 3.4.20 2001-07-28 11:59:33 +00:00
darrenr
99e3b6df83 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
markm
3bf4bc0b71 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
darrenr
48b4ca8e6a fix conflicts 2001-02-04 14:26:56 +00:00
darrenr
5e62aa9b3d Import IP Filter update 2001-02-04 14:25:38 +00:00
darrenr
53b25e2c4c 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
4527b5166f Adapt to new struct kinfo_proc and unbreak world.
Apologies to: darrenr who is maintainer
2000-12-14 23:35:57 +00:00
darrenr
7595d5ffce Import IP Filter 3.4.12 2000-10-26 12:45:54 +00:00
darrenr
e2c5762cd8 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
darrenr
54a2153765 Import base ipfilter 3.4.9 into contrib dir. 2000-08-13 04:58:02 +00:00
darrenr
8a08561307 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
darrenr
e5c6607625 fix conflicts 2000-05-24 02:19:15 +00:00
darrenr
dda6755c7b Import IP Filter 3.4.4 into FreeBSD-current 2000-05-24 02:14:22 +00:00
darrenr
9a5646e13d 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
b4155d9e95 Remove files not in the v3_3_8 import. 2000-02-10 05:09:52 +00:00
peter
cf9ed6d8c9 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
c3aa6ac872 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
60ab23b038 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
0539756f3d 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
9452e54400 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