Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by: re (implicit)

Remove unneeded include of <sys/timeb.h>.

This header file should not be included by anything.

Remove udp and tcp includes not needed here.

Tripped over by: a compile of an upcoming change
MFC after: 1 month

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

2020447 IPFilter's NAT can undo name server random port selection

Approved by: darrenr
MFC after: 1 week
Security: CERT VU#521769

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.

Pullup IPFilter 4.1.28 from the vendor branch into HEAD.

MFC after: 7 days

Merge IPFilter 4.1.23 back to HEAD
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13

Resolve conflicts

MFC after: 1 weeks

Resolve conflicts (and believe me...you don't want to know).

* 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.

This commit was generated by cvs2svn to compensate for changes in r145510,
which included commits to RCS files with non-trunk default branches.

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

This commit was generated by cvs2svn to compensate for changes in r130887,
which included commits to RCS files with non-trunk default branches.

bring changes in IPFilter to 3.4.31 on to the head

This commit was generated by cvs2svn to compensate for changes in r110917,
which included commits to RCS files with non-trunk default branches.

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.

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.

This commit was generated by cvs2svn to compensate for changes in r98005,
which included commits to RCS files with non-trunk default branches.

resolve conflicts from import

fix conflicts generated by import, completing import of ipf3.4.25

This commit was generated by cvs2svn to compensate for changes in r92686,
which included commits to RCS files with non-trunk default branches.

Backout inclusion of sys/queue.h

add queue.h, now needed for file.h

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.

Compensate for "Compensate for header dethreading" by backing it out.

fix conflicts created by import

This commit was generated by cvs2svn to compensate for changes in r80486,
which included commits to RCS files with non-trunk default branches.

Compensate for dethreaded headers.
(I have no religion about how this was done. Follow-up commits welcome)

fix conflicts

This commit was generated by cvs2svn to compensate for changes in r72003,
which included commits to RCS files with non-trunk default branches.

Adapt to new struct kinfo_proc and unbreak world.
Apologies to: darrenr who is maintainer

This commit was generated by cvs2svn to compensate for changes in r67615,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r64588,
which included commits to RCS files with non-trunk default branches.

fix conflicts

This commit was generated by cvs2svn to compensate for changes in r60841,
which included commits to RCS files with non-trunk default branches.

Remove files not in the v3_3_8 import.

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.

This commit was generated by cvs2svn to compensate for changes in r55924,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r53024,
which included commits to RCS files with non-trunk default branches.

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

Merge 3.2.3 -> 3.2.7 changes into mainline.

This commit was generated by cvs2svn to compensate for changes in r37074,
which included commits to RCS files with non-trunk default branches.

Fix a bunch of spelling errors.

PR: 6856
Submitted by: Josh Gilliam <josh@quick.net>

Some tweaks to get this to compile for the userland tools.

This commit was generated by cvs2svn to compensate for changes in r34739,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r31183,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r26119,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r24583,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r23279,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r22514,
which included commits to RCS files with non-trunk default branches.