Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

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

Bulk sync of pf changes from head, in attempt to fixup broken build I
made in r263029.

Merge r257186,257215,257349,259736,261797.

These changesets split pfvar.h into several smaller headers and make
userland utilities to include only some of them.

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

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

Convert Makefile to have only one file for each line, while I'm there, sort
SRCS to ease future upgrades.

MFV: tcpdump 4.4.0.

MFC after: 4 weeks

MFV: tcpdump 4.3.0.

MFC after: 4 weeks

Provide ability for printing and decoding pfsync(4) traffic. This
doesn't mean supporting IFT_PFSYNC (which I hope will eventually
die). This means decoding packets with IP protocol of 240 caught
on any normal interface like Ethernet.

The code is based on couple of files from OpenBSD, significantly
modified by myself.

Parser differentiates for four levels of verbosity: no -v, -v,
-vv and -vvv.

We don't yet forward this code upstream, because currently it
strongly relies on if_pfsync.h and even on pfvar.h. I hope that
this can be fixed in future.

Reviewed by: gnn, delphij

Correct double "the the"

Approved by: cperciva
MFC after: 3 days

Merge tcpdump 4.2.1.

MFC after: 2 weeks

Remove trailing whitespace per mdoc lint warning

Disussed with: gavin
No objection from: doc
Approved by: joel
MFC after: 3 days

Spelling fixes for usr.sbin/

- change "is is" to "is" or "it is"
- change "the the" to "the"

Approved by: lstewart
Approved by: sahil (mentor)
MFC after: 3 days

Actually remove the HAVE_CAST_H define this time.

Regenerate our usr.sbin/tcpdump/tcpdump/config.h for tcpdump 4.1.1, and
remove unused HAVE_RC5_H and HAVE_CAST_H defines from CFLAGS.

Add print-ipnet.c

Submitted by: dim

Update for the new tcpdump 4.1.1. The man page is a result of running
tcpdump's autoconf on FreeBSD.

MFtbemd:

Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want
to test of all the CPUs of a given family conform.

The last big commit: let usr.sbin/ use WARNS=6 by default.

Add new build targets for tcpdump 4.0.0.

Update for tcpdump 3.9.8

De-orbit burn tcpslice.

Reviewed by: sam, bmah

Disconnect tcpslice from build.

Reviewed by: sam, bmah

Fix our ancient tcpslice for >2GB limits.

PR: bin/13691
MFC after: 1 week
Submitted by: Bruce A. Mah

update for v3.9.4

MFC after: 1 month

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

update for v3.9.1 (releaes)

Approved by: re (scottl)

update after import of v3.9.1-096

Reviewed by: bms

NOINET6 -> NO_INET6

NOCRYPT -> NO_CRYPT

Join the 21st century: Cryptography is no longer an optional component
of releases. The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by: re (scottl), markm
Discussed on: freebsd-current, in late April 2004

Mechanically kill hard sentence breaks.

Merge of tcpdump 3.8.3 from tcpdump.org.

Don't check for the existance of src/crypto/ for building items that
may contain crypto. The days of ITAR paranoia are over, and the simple
macro tests that remain are sufficient.

Retire the useless NOSECURE knob.

Approved by: re (scottl)

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Remove out-of-date -I.

Update for tcpdump 3.7.1

Use `The .Nm utility'

I've been meaning to do this for a while. Add an underscore to the
time_to_xxx() and xxx_to_time() functions. e.g. _time_to_xxx()
instead of time_to_xxx(), to make it more obvious that these are
stopgap functions & placemarkers and not meant to create a defacto
standard. They will eventually be replaced when a real standard
comes out of committee.

Do not assume that sizeof(tv_sec) is sizeof(time_t) - it will be, but
it isn't yet because our tv_sec is currently a long (so 64 bit architectures
are already broken to a degree).

mdoc(7) police: join split punctuation to macro calls.

Use alignment-safe code on non-i386 architectures.

Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.

Remove whitespace at EOL.

Don't try to compile v6-only files if NOINET6.

PR: misc/28287 , misc/28288

mdoc(7) police: remove extraneous .Pp before and/or after .Sh.

Style changes. Not purfect, but closer to other Makefiles in the tree.

Approved by: fenner

Update for tcpdump 3.6.2

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

mdoc(7) police: split punctuation characters + misc fixes.

mdoc(7) police: use the new features of the Nm macro.

1000000 usecs to 1 sec conversion

Fix miscellaneous mdoc macro argument limit infringements.

PR: 18465
Reported by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

Test for existence of secure/, not crypto/ for consistency

Submitted by: jhay

Fix world with -DNOCRYPT, hopefully fix release for non-crypto collection.

Reported by: Jason Garman <jgarman@wedgie.org>
Feedback by: bde, Bob Bishop <rb@gid.co.uk>, jhay

Make crypto part of tcpdump (print-esp.c) work.

Approved by: jkh

Merge tcpdump 3.5

Remove -g compiler flag.

$Header$ -> $FreeBSD$

$Id$ -> $FreeBSD$

World, I'd like you to meet the first FreeBSD token Ring driver.
This is for various Olicom cards. An IBM driver is following.
This patch also adds support to tcpdump to decode packets on tokenring.
Congratulations to the proud father.. (below)

Submitted by: Larry Lile <lile@stdio.com>

Fix raw timestamps (zero-pad usecs)
Print 4-digit years in TIMESTAMP_PARSEABLE mode after '99.

PR: bin/9507

Use 69 pivot kludge from date(1) to make it consistant. Also honor
is_delta and only apply date kludge when it isn't a delta time.

Y2K nit:
Make two digit years specified on the command line represent
the century that the computer currently resides. So 99 means
1999 this year, but 2099 next year.

Pointed out by: Peter Jeremy <peter.jeremy@auss2.alcatel.com.au>

Fix CFLAGS: s/ETHER_NTOA/ETHER_NTOHOST/

PR: bin/8130
Submitted by: Dan Nelson <dnelson@emsphone.com>

Update for tcpdump 3.4

.Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq.

Fixed `make -jN' for large N. version.h was missing from SRCS,
SRCS was disordered to work around the bug for plain `make', and
the version number was bumped twice by building two copies of
version.[ch] concurrently.

Convert to mdoc format. Remove unused vars. Use err(3) and change exit(-1).

Handle frame relay, decode ATM VP/VC info, and handle ISO over FR.

Update Makefile to build tcpdump-3.3 .

PR: 3371
Submitted by: Chris Timmons <skynyrd@opus.cts.cwu.edu>

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Fix typo in last commit...sigh

Change DISTDIR to TCPDUMP_DISTDIR

Uniquely name the distribution directory variable so that it can be overridden
for multiple packages at the same time.

Pickup VERSION from the tcpdump sources in contrib/tcpdump. Allows
`make world' to work again.

Fix up path

Grab tcpdump out of src/contrib/tcpdump

Fix a bug, it was returning a pointer to a variable on the stack, instead
of the specially strdup()'ed version.

Define ETHERS_SERVICE, since our OS provides it. Otherwise, you
can't do a "tcpdump 'gateway foo'" unless it's in /etc/ethers - it wasn't
reading the NIS tables.

Import fixes from NetBSD to print NFSv3 packets.

Obtained from: NetBSD

Update IGMP printing, removing the obsolete packet header version number &
changing "new" and "old" to "v2" and "v1" to allow for future changes not
having to be "newer new"

Recognize Router Alert IP option

John Hay's extentions to tcpdump to be able to differentiate between
IP and IPX packets over a PPP link. I added the hack to print the
PPP protocol type for other (eg: LCP, CCP, etc) packets.

Submitted by: John Hay <jhay@mikom.csir.co.za>, mods from me.

There is no longer a typedef clash with <rpc/auth.h>, so remove
conditional. Also, use the system defined fixed sized types.
This removes a 32-bit dependency on non-32-bit architectures.

Correct some manual page cross reference errors. E.g. su is a section
one man page, not section eight. This is the first round of such changes
and only fixes man pages in manual section one.

Teach tcpdump to print out router advertisement and solicitation messages.

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

recording cvs-1.6 file death

Correctly determine the local timezone, by looking at the tm_gmtoff result
from localtime() rather than the bogus struct tz filled in by gettimeofday.

Print EtherTalk packets correctly; closes PR 649.
Document `-T' option in manual page.

Submitted by: Toshihiro Kanda <candy@fct.kgc.co.jp> (first fix only)

Add support for printking Kerberos v4 packets (file I forgot to add)

Obtained from: John Hawkinson <jhawk@mit.edu> by way of comp.protocols.kerberos

Add support for printing Kerberos v4 packets.

Fixed bug with decoding RIP packets - removed unnecessary ntohs()'s for
the sa_family.

Clean up compilation warnings.

Make tcpdump a lot smarter about printing IGMP messages. Derived by groveling
about in the mrouted sources and looking at packet traces.

Remove trailing whitespace.

tcpdump is in (1) not (l)

Add `-I.' to CFLAGS in order to fix the `make depend' problem.

Make tcpdump understand the T/TCP (RFC-1644) options. Some extra sanity
checks were also introduced to the tcp_print function so it doesn't try
to interpret TCP options beyond the length of the sniffed packet.

Upgrade tcpdump and tcpslice to version 3.0
Obtained from: ftp.ee.lbl.gov and Vern Paxson <vern@ee.lbl.gov>

Changed two occurrences of tcpdump(l) to tcpdump(1).

once more

More abs paths nuked

Correctly interpret the code field of IGMP membership queries.

Print out SNAP frames reasonably, including Apple's bogus Ethertalk
pseudo-SNAP encapsulation. Still needs some work, by someone who
has a listing of 802.2 LSAPs.

Print out more useful information about IGMP packets. (Someday, this should
include a full DVMRP parser.)

Add dependencies on libraries to DPADD. Someday this should be done
automagically. -lfoo has to be right to work, but ${LIBFO0} is too
easy to forget or misspell; nothing checks it and it should be
different for shared libraries.

Latest flex requires yywrap() function to avoid -ll.

Add lex lib to LDADD.
Submitted by: jkh

Fix gross spelling and typographical errors pointed out by Keith Bostic.

When hexdumping a RIP entry, type cast the bytes to unsigned first. Not
doing so caused them to be sign-extended to an int (which really messed
things up).

Fixed bug in decoding of RIP packets. RIP data is in "osockaddr" format;
the fix is to import the structures from protocols/routed.h and change
the sockaddr to osockaddr. We can't change the generic include file
because too many other things rely on this in order to deal with the
kernel routing socket (which is sockaddr format).

Include <rpc/rpc.h> instead of various individual <rpc/*.h> header files
to compile with the newly prototyped rpc headers.

Added -DPPP so that tcpdump understands ppp

Added #ifndef inline #endif around definition of inline so that we
do not end up definig it twice.

TCPDUMP was installing in /usr/local/bin, changed to /usr/sbin.

New manual page system

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