tpcdump: Update to 4.99.4

Local changes:

- Update some local modifications to fix build
- Synch config.h with upstream as much as possible

Changelog: https://git.tcpdump.org/tcpdump/blob/55bc126b0216cfe409b8d6bd378f65679d136ddf:/CHANGES
Reviewed by: emaste
Obtained from: https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz
Sponsored by: The FreeBSD Foundation

Update tcpdump to 4.9.2

It contains many fixes, including bounds checking, buffer overflows (in
SLIP and bittok2str_internal), buffer over-reads, and infinite loops.

One other notable change:
Do not use getprotobynumber() for protocol name resolution.
Do not do any protocol name resolution if -n is specified.

Submitted by: gordon
Reviewed by: delphij, emaste, glebius
MFC after: 1 week
Relnotes: Yes
Security: CVE-2017-11108, CVE-2017-11541, CVE-2017-11542
Security: CVE-2017-11543, CVE-2017-12893, CVE-2017-12894
Security: CVE-2017-12895, CVE-2017-12896, CVE-2017-12897
Security: CVE-2017-12898, CVE-2017-12899, CVE-2017-12900
Security: CVE-2017-12901, CVE-2017-12902, CVE-2017-12985
Security: CVE-2017-12986, CVE-2017-12987, CVE-2017-12988
Security: CVE-2017-12989, CVE-2017-12990, CVE-2017-12991
Security: CVE-2017-12992, CVE-2017-12993, CVE-2017-12994
Security: CVE-2017-12995, CVE-2017-12996, CVE-2017-12997
Security: CVE-2017-12998, CVE-2017-12999, CVE-2017-13000
Security: CVE-2017-13001, CVE-2017-13002, CVE-2017-13003
Security: CVE-2017-13004, CVE-2017-13005, CVE-2017-13006
Security: CVE-2017-13007, CVE-2017-13008, CVE-2017-13009
Security: CVE-2017-13010, CVE-2017-13011, CVE-2017-13012
Security: CVE-2017-13013, CVE-2017-13014, CVE-2017-13015
Security: CVE-2017-13016, CVE-2017-13017, CVE-2017-13018
Security: CVE-2017-13019, CVE-2017-13020, CVE-2017-13021
Security: CVE-2017-13022, CVE-2017-13023, CVE-2017-13024
Security: CVE-2017-13025, CVE-2017-13026, CVE-2017-13027
Security: CVE-2017-13028, CVE-2017-13029, CVE-2017-13030
Security: CVE-2017-13031, CVE-2017-13032, CVE-2017-13033
Security: CVE-2017-13034, CVE-2017-13035, CVE-2017-13036
Security: CVE-2017-13037, CVE-2017-13038, CVE-2017-13039
Security: CVE-2017-13040, CVE-2017-13041, CVE-2017-13042
Security: CVE-2017-13043, CVE-2017-13044, CVE-2017-13045
Security: CVE-2017-13046, CVE-2017-13047, CVE-2017-13048
Security: CVE-2017-13049, CVE-2017-13050, CVE-2017-13051
Security: CVE-2017-13052, CVE-2017-13053, CVE-2017-13054
Security: CVE-2017-13055, CVE-2017-13687, CVE-2017-13688
Security: CVE-2017-13689, CVE-2017-13690, CVE-2017-13725
Differential Revision: https://reviews.freebsd.org/D12404

Update tcpdump to 4.9.0.

It fixes many buffer overflow in different protocol parsers, but none of
them are critical, even in absense of Capsicum.

Security: CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925
Security: CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929
Security: CVE-2016-7930, CVE-2016-7931, CVE-2016-7932, CVE-2016-7933
Security: CVE-2016-7934, CVE-2016-7935, CVE-2016-7936, CVE-2016-7937
Security: CVE-2016-7938, CVE-2016-7939, CVE-2016-7940, CVE-2016-7973
Security: CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984
Security: CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993
Security: CVE-2016-8574, CVE-2016-8575, CVE-2017-5202, CVE-2017-5203
Security: CVE-2017-5204, CVE-2017-5205, CVE-2017-5341, CVE-2017-5342
Security: CVE-2017-5482, CVE-2017-5483, CVE-2017-5484, CVE-2017-5485
Security: CVE-2017-5486

MFV r285191: tcpdump 4.7.4.

Also, the changes made in r272451 and r272653 that were lost in the
merge of 4.6.2 (r276788) have been restored.

PR: 199568
Differential Revision: https://reviews.freebsd.org/D3007
Reviewed by: brooks, hiren
Approved by: jmallett (mentor)
MFC after: 1 month

Merge from CheriBSD: 1065cf515a7c2062598009c1318055aacbb39e80

Convert the pfsync dissector to use the netdissect framework.

Differential Revision: https://reviews.freebsd.org/D2359
Reviewed by: glebius
Sponsored by: DARPA, AFRL

MFV r277782:

Merge some cherry-picked fixes originating in OpenBSD

Check whether the version field is available before looking at it.
While we're at it, use ND_TCHECK(), rather than a hand-rolled check, to
check whether we have the full fixed-length portion of the IPv4 header.

commit c67afe913011138a2504ec4d3d423b48e73b12f3

Do more length checking. From OpenBSD.

commit d7516761f9c4877bcb05bb6543be3543e165249

MFV r276761: tcpdump 4.6.2.

MFC after: 1 month

Make userland tools honor WITHOUT_PF build option.

Tested by: dt71@gmx.com

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

Merge tcpdump 4.2.1.

MFC after: 2 weeks

Merge tcpdump-4.1.1.

Merge tcpdump 4.0.0 from the vendor branch.

Flatten vendor/tcpdump and remove keyword expansion.

Resolve merge conflicts

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

Import of tcpdump v3.9.8

resolve merge conflicts

MFC after: 1 month

Import of tcpdump v3.9.4

resolve merge conflicts

Approved by: re (scottl)

Virgin import of tcpdump v3.9.1 (release) from tcpdump.org

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

Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org

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().

Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gz

Merge tcpdump 3.7.2

Import tcpdump 3.7.2 (fudging for multi-DLT support) from
http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz

Merge tcpdump 3.7.1

MFC after: 2 weeks

Import tcpdump 3.7.1, from
http://www.tcpdump.org/release/tcpdump-3.7.1.tar.gz

Merge tcpdump 3.6.2

Virgin import of tcpdump.org tcpdump v3.6.2

Merge tcpdump 3.5

Virgin import of tcpdump.org tcpdump v3.5

Merge tcpdump 3.4

PR: bin/7877

Virgin import of LBL tcpdump v3.4

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>

Virgin import of LBL tcpdump v3.3

LBL chose to use IPPROTO_ENCAP to represent IP proto 4 encapsulation
as performed by the multicast kernel modifications. However, BSD
already had IPPROTO_ENCAP defined as 98 (RFC 1241 encapsulation).

This changes the use of IPPROTO_ENCAP to IPPROTO_IPIP, which is
the BSD name for IP proto 4.

Fix the IGMP printer. A lost pair of parenthesis caused all IGMP
reports to be printed as IGMPv1, and a misapplied patch caused
IGMP Leave messages to be partially interpreted as DVMRP routing
messages.

Improvements to IGMP message decoding.
Add support for the router-alert option.
Submitted by: Bill Fenner <fenner@parc.xerox.com>

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.

Merge from CheriBSD: 1065cf515a7c2062598009c1318055aacbb39e80

Convert the pfsync dissector to use the netdissect framework.

Differential Revision: https://reviews.freebsd.org/D2359
Reviewed by: glebius
Sponsored by: DARPA, AFRL

Make userland tools honor WITHOUT_PF build option.

Tested by: dt71@gmx.com

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

A new jail(8) with a configuration file, to replace the work currently done
by /etc/rc.d/jail.

Create the altix project branch. The altix project will add support
for the SGI Altix 350 to FreeBSD/ia64. The hardware used for porting
is a two-module system, consisting of a base compute module and a
CPU expansion module. SGI's NUMAFlex architecture can be an excellent
platform to test CPU affinity and NUMA-aware features in FreeBSD.

- Import the HEAD csup code which is the basis for the cvsmode work.

Resolve merge conflicts

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

Import of tcpdump v3.9.8

resolve merge conflicts

MFC after: 1 month

Import of tcpdump v3.9.4

resolve merge conflicts

Approved by: re (scottl)

Virgin import of tcpdump v3.9.1 (release) from tcpdump.org

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

Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org

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().

Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gz

Merge tcpdump 3.7.2

Import tcpdump 3.7.2 (fudging for multi-DLT support) from
http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz

Merge tcpdump 3.7.1

MFC after: 2 weeks

Import tcpdump 3.7.1, from
http://www.tcpdump.org/release/tcpdump-3.7.1.tar.gz

Merge tcpdump 3.6.2

Virgin import of tcpdump.org tcpdump v3.6.2

Merge tcpdump 3.5

Virgin import of tcpdump.org tcpdump v3.5

Merge tcpdump 3.4

PR: bin/7877

Virgin import of LBL tcpdump v3.4

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>

Virgin import of LBL tcpdump v3.3

LBL chose to use IPPROTO_ENCAP to represent IP proto 4 encapsulation
as performed by the multicast kernel modifications. However, BSD
already had IPPROTO_ENCAP defined as 98 (RFC 1241 encapsulation).

This changes the use of IPPROTO_ENCAP to IPPROTO_IPIP, which is
the BSD name for IP proto 4.

Fix the IGMP printer. A lost pair of parenthesis caused all IGMP
reports to be printed as IGMPv1, and a misapplied patch caused
IGMP Leave messages to be partially interpreted as DVMRP routing
messages.

Improvements to IGMP message decoding.
Add support for the router-alert option.
Submitted by: Bill Fenner <fenner@parc.xerox.com>

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.