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

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

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

Diff reduction against tcpdump revision 949a22064d3534eddeb8aa2b9c36a50e45fe16fa.

MFV: tcpdump 4.4.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

Merge tcpdump 4.2.1.

MFC after: 2 weeks

Merge tcpdump-4.1.1.

Merge tcpdump 4.0.0 from the vendor branch.

Resolve merge conflicts

Approved by: re (kensmith)
Obtained from: tcpdump.org

resolve merge conflicts

MFC after: 1 month

resolve merge conflicts

Approved by: re (scottl)

resolve merge conflicts and update for proper build; including:

o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h

Reviewed by: bms

Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats:

print-atm.c no longer performs special handling for FORE headers; these
can no doubt be re-added at a later date.

print-fr.c is effectively a no-op.

print-llc.c has had the default_print_unaligned() call removed as
tcpdump no longer defines this function, however the prototype is still
present. Suggest we roll in a diff to use print_unknown_data().

Merge tcpdump 3.7.2

Merge tcpdump 3.7.1

MFC after: 2 weeks

In TTEST2(), check to make sure the "l" argument isn't so large that
"snapend - l" underflows; this fixes a buffer overflow with malformed
NFS packets, and may fix other buffer overflows with malformed packets.

Obtained from: tcpdump.org CVS

Merge tcpdump 3.6.2

Merge tcpdump 3.5

Support PPPoE.
Add a missing comma to the lcp config options table.

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>

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

Virgin import of LBL tcpdump v3.4

Virgin import of LBL tcpdump v3.3

Virgin import of unmodified tcpdump v3.2.1 distribution from LBL.
Obtained from: ftp://ftp.ee.lbl.gov/tcpdump.tar.Z on 19-Aug-1996.