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

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

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

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

Fix NULL pointer dereference bug when parsing IPV6CP traffic.
This file is already off the vendor branch, and the fix will be
in future tcpdump.org vendor branch imports.

PR: bin/76497
MFC after: 1 week
Obtained from: tcpdump.org rev 1.89.2.4
Discussed with: fenner, keramida

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

MFC after: 2 weeks

Merge tcpdump 3.6.2

Merge tcpdump 3.5

Pass the pppoe packets into do_ppp_print correctly.

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

Merge tcpdump 3.4

PR: bin/7877

PR: 7741
Submitted by: Hellmuth Michaelis <hm@kts.org>
add LCP/PAP/CHAP/IPCP frame printing functionality

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

Merge tcpdump 3.3.
The print_nfs.c changes are pretty extensive; this is partially because
LBL did a lot of cleanup and partially because I removed lots of
pointless changes away from the LBL style.

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

Update to reflect changes in net/if.h.

Print IPX packets over a PPP link.
Always display IPX network number in decimal (industry standard).
Decode other PPP protocol types too.

Submitted by: peter, pst, John Hay <jhay@mikom.csir.co.za>

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

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.