Remove svn:mergeinfo from the releng/10.0 branch.

After branch creation from stable/10, the stable/10 branch mergeinfo
was moved to the root of the branch.

Since there have not been any merges from stable/10 to releng/10.0
yet, we do not need to track any of the existing mergeinfo here.

Merges to releng/10.0 should now be done to the root of the branch.

For future branches during the release cycle, unless otherwise noted,
this change will be done as part of the stable/ and releng/ branch
creation.

Discussed with: peter
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

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

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

Remove redundant files.

Approved by: glebius (mentor)
Approved by: re (blanket)

Check return code from inet_pton.

Discovered by: Coverity.
Approved by: glebius (mentor)
Approved by: re (blanket)

Update ipfilter 4.1.28 --> 5.1.2.

Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)

As per the developers handbook (5.3.1 step 1), bootstrap svn:mergeinfo on
the ipfilter directories in the main tree to the last commit made to
the ipfilter trees in the vendor branches (r253468) which flattened the
ipfilter vendor trees.

Now that this step is complete, we are free to import new sources into the
ipfilter vendor trees.

Approved by: glebius (Mentor)

Retire struct sockaddr_inarp.

Since ARP and routing are separated, "proxy only" entries
don't have any meaning, thus we don't need additional field
in sockaddr to pass SIN_PROXY flag.

New kernel is binary compatible with old tools, since sizes
of sockaddr_inarp and sockaddr_in match, and sa_family are
filled with same value.

The structure declaration is left for compatibility with
third party software, but in tree code no longer use it.

Reviewed by: ru, andre, net@

Clean some 'svn:executable' properties in the tree.

Submitted by: Christoph Mallon
MFC after: 3 days

Fix paths for example files.

Use pcap's bpf header, not our own copy of it.

Comment in the BUGS section header. Matches what's in ipfilter 5.10.

PR: 144880
Submitted by: Glen Barber <glen.j.barber@gmail.com>
MFC after: 1 week

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

This header file should not be included by anything.

fix spelling mistake

Fix a typo that causes the for loop to exit immediately. There's
identical loop a few lines above.

Reviewed by: sam
Approved by: ed (mentor)
Silence from: darrenr (maintainer)

- Prevent buffer overflow in IPFilter's load_http function used to load
ipfilter tables via http by the user-level ippool utility. Previously
the 1024-byte buffer used to store a http request coudld easily overflow
if the length of the hostname part of the url passes exceeded 496 bytes. [1]
- Use snprintf to prevent possieble buffer overflows in future. [2]
- Do not try to close the descriptor twice on failure. [2]

Reported by: Maksymilian Arciemowicz <cxib@securityreason.com> [1]
Obtained from: NetBSD CVS [2]
MFC after: 2 weeks

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

Fix build when WITHOUT_DYNAMICROOT is specified in src.conf(5).

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

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

ipfstat should parse "any" when used with -D/-S command line options

PR: bin/113879
Submitted by: kabe@sra-tohoku.co.jp
Reviewed by: darrenr
Approved by: re

Remove files no longer required to build IPFilter

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

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

Resolve conflicts

MFC after: 1 weeks

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

fix "ipf -Z" reporting rubbish and possibly panic'ing box

MFC after: 4 days

Add a man page for mkfilters(1) and put the corrected perl script in the
ipfilter usr/share directory

PR: docs/26879

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

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

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)

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)

Since this is already off the vendor branch: Our kernel is now in
/boot/kernel/kernel, not plain /kernel

arm defaults to unsigned char as well.

Enable building /sbin/ipf (but not the rescue version) with the ability to
parse bpf strings for filter rules in ipf.conf

Fix tinderbox build on ppc.

Requested by: mlaier

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.

Patches from Ruslam Ermilov to remove NetBSD bits from Makefiles and cleanup
build problems with rescue.

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.

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"

this file does not belong in a freebsd distribution

* 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 r145513,
which included commits to RCS files with non-trunk default branches.

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.

if_name and if_unit renaming to if_xname should be dealth with in
ipmon as well.

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

update man page to reflect change in default syslog level ipmon is now compiled with

Change the default syslog facility from LOG_LOCAL0 to LOG_SECURITY after
discussion on security@freebsd.org.

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.

merge the changes from 3.4.29 that didn't go cleanly due to conflicts

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

Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28

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

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

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

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

resolve conflicts from import

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

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

Removed (new in 3.4.25 import) duplicate copies of files already present
in sys/contrib/ipfilter.

For this regression test to pass, you must run ipmon in the Australia/Victoria
(EST-10) timezone to generate the correct timestamps in output.

remove because of licence reasons

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

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

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.

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

Removed duplicate copies of files already present in sys/contrib/ipfilter.

Not objected to by: -arch

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

fix conflicts created by import

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

fix conflicts from rcsids

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

resolve conflicts

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

actually commit merged diffs to the trunk

Fix breakage caused by ether_aton() prototype change.

PR: bin/20033

fix conflicts

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

define CSUM_DELAY_DATA to match merge

fix up #ifdef jungle for FreeBSD

remove duplicate prototypes

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 r57093,
which included commits to RCS files with non-trunk default branches.

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.

ipfstat is now in section 8 of the manual.

PR: 7791
Submitted by: Stefan Eggers <seggers@semyam.dinoco.de>

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

Remove bogus reference to mkfilters(1)

PR: docs/7790
Submitted by: Stefan Eggers seggers@semyam.dinoco.de

Comment out empty "BUGS" section.

PR: 8121
Submitted by: Norihiro Kumagai <kuma@jp.freebsd.org>

Remove duplicate entries for -N and -S commandline switches.

PR: 8120
Submitted by: Horihiro Kumagaio <kuma@jp.freebsd.org>

Typo fix: "whether on not" -> "whether or not".

PR: 8102
Submitted by: Kazuo Horikawa <horikawa@jp.freebsd.org>

vmunix -> kernel
PR: port/8543
Submitted by: jkb@best.com

Fixed the type of a signal handler.

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.

Spelling fixes.

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

Fix a bunch of spelling errors.

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

Spelling corrections.

PR: 6829
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.

Remove one last /etc/sysconfig reference.

PR: 3460
Pointed out by: hoek@FreeBSD.org

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 r26121,
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.