25466336 Update tcpdump to version 4.9.0
authorRich Burridge <rich.burridge@oracle.com>
Fri, 17 Feb 2017 12:07:20 -0800
changeset 7674 e5be4a3b0c32
parent 7671 a092c6b08fcc
child 7675 a1504c073861
25466336 Update tcpdump to version 4.9.0 25466334 problem in UTILITY/TCPDUMP
components/tcpdump/Makefile
components/tcpdump/patches/10-arphrd-infiniband.patch
components/tcpdump/patches/fix-man-pages.patch
components/tcpdump/patches/man.patch
components/tcpdump/patches/system-test.patch
components/tcpdump/tcpdump.license
components/tcpdump/test/results-64.master
--- a/components/tcpdump/Makefile	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/Makefile	Fri Feb 17 12:07:20 2017 -0800
@@ -20,19 +20,19 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tcpdump
-COMPONENT_VERSION=	4.7.4
+COMPONENT_VERSION=	4.9.0
 COMPONENT_PROJECT_URL=	http://www.tcpdump.org/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:5a321f0fb959b928f26112c9f49f81d754c23c1d8ffb0feb69304fee06b77e0a
+    sha256:eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)release/$(COMPONENT_ARCHIVE)
 
-TPNO=			22949
+TPNO=			33618
 
 # Enable adiheap and adistack security extensions
 ADIHEAP_MODE =	$(ADIHEAP_ENABLE)
--- a/components/tcpdump/patches/10-arphrd-infiniband.patch	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/patches/10-arphrd-infiniband.patch	Fri Feb 17 12:07:20 2017 -0800
@@ -1,13 +1,10 @@
-InfiniBand support for tcpdump. 
-This is an in-house patch. Sent upstream for potential inclusion in future 
+InfiniBand support for tcpdump.
+This is an in-house patch. Sent upstream for potential inclusion in future
 versions of tcpdump.
 
-Using DLT value 162 is Solaris specific.
-
-diff -rupN tcpdump-4.7.4-orig/Makefile.in tcpdump-4.7.4/Makefile.in
---- tcpdump-4.7.4-orig/Makefile.in	2015-05-26 14:13:17.000000000 -0700
-+++ tcpdump-4.7.4/Makefile.in	2015-05-26 15:12:05.727800640 -0700
[email protected]@ -138,6 +138,7 @@ LIBNETDISSECT_SRC=\
+--- tcpdump-4.9.0/Makefile.in.orig	2017-01-29 12:23:58.596267167 +0000
++++ tcpdump-4.9.0/Makefile.in	2017-01-29 12:49:27.808281048 +0000
[email protected]@ -147,6 +147,7 @@
  	print-ipcomp.c \
  	print-ipfc.c \
  	print-ipnet.c \
@@ -15,30 +12,27 @@
  	print-ipx.c \
  	print-isakmp.c \
  	print-isoclns.c \
-diff -rupN tcpdump-4.7.4-orig/netdissect.h tcpdump-4.7.4/netdissect.h
---- tcpdump-4.7.4-orig/netdissect.h	2015-05-26 14:13:17.000000000 -0700
-+++ tcpdump-4.7.4/netdissect.h	2015-04-22 13:32:16.000000000 -0700
[email protected]@ -395,6 +395,8 @@ extern void ether_print(netdissect_optio
- 
- extern u_int ether_if_print(netdissect_options *,
-                             const struct pcap_pkthdr *,const u_char *);
-+extern u_int ipoib_if_print(netdissect_options *,
-+                            const struct pcap_pkthdr *, const u_char *);
- extern u_int netanalyzer_if_print(netdissect_options *,
-                                   const struct pcap_pkthdr *,const u_char *);
- extern u_int netanalyzer_transparent_if_print(netdissect_options *,
-diff -rupN tcpdump-4.7.4-orig/print-arp.c tcpdump-4.7.4/print-arp.c
---- tcpdump-4.7.4-orig/print-arp.c	2015-05-26 14:13:17.000000000 -0700
-+++ tcpdump-4.7.4/print-arp.c	2015-03-09 12:07:00.000000000 -0700
[email protected]@ -55,6 +55,7 @@ struct  arp_pkthdr {
+--- tcpdump-4.9.0/netdissect.h.orig	2017-01-29 12:25:29.886259423 +0000
++++ tcpdump-4.9.0/netdissect.h	2017-01-29 12:27:00.348907240 +0000
[email protected]@ -410,6 +410,7 @@
+ extern u_int ieee802_11_radio_if_print IF_PRINTER_ARGS;
+ extern u_int ieee802_15_4_if_print IF_PRINTER_ARGS;
+ extern u_int ipfc_if_print IF_PRINTER_ARGS;
++extern u_int ipoib_if_print IF_PRINTER_ARGS;
+ extern u_int ipnet_if_print IF_PRINTER_ARGS;
+ extern u_int juniper_atm1_print IF_PRINTER_ARGS;
+ extern u_int juniper_atm2_print IF_PRINTER_ARGS;
+--- tcpdump-4.9.0/print-arp.c.orig	2017-01-29 12:27:35.797281364 +0000
++++ tcpdump-4.9.0/print-arp.c	2017-01-29 12:28:48.668009704 +0000
[email protected]@ -56,6 +56,7 @@
  #define ARPHRD_ATM2225  19      /* ATM (RFC 2225) */
  #define ARPHRD_STRIP    23      /* Ricochet Starmode Radio hardware format */
  #define ARPHRD_IEEE1394 24      /* IEEE 1394 (FireWire) hardware format */
-+#define ARPHRD_INFINIBAND 32   /* InfiniBand RFC 4391 */
++#define ARPHRD_INFINIBAND 32    /* InfiniBand RFC 4391 */
          u_short ar_pro;         /* format of protocol address */
          u_char  ar_hln;         /* length of hardware address */
          u_char  ar_pln;         /* length of protocol address */
[email protected]@ -115,6 +115,7 @@ static const struct tok arphrd_values[]
[email protected]@ -116,6 +117,7 @@
      { ARPHRD_STRIP, "Strip" },
      { ARPHRD_IEEE1394, "IEEE 1394" },
      { ARPHRD_ATM2225, "ATM" },
@@ -46,10 +40,9 @@
      { 0, NULL }
  };
  
-diff -rupN tcpdump-4.7.4-orig/print-ipoib.c tcpdump-4.7.4/print-ipoib.c
---- tcpdump-4.7.4-orig/print-ipoib.c	1969-12-31 16:00:00.000000000 -0800
-+++ tcpdump-4.7.4/print-ipoib.c	2015-05-26 14:13:17.000000000 -0700
[email protected]@ -0,0 +1,132 @@
+--- tcpdump-4.9.0/print-ipoib.c.orig	2017-01-29 12:30:15.468355816 +0000
++++ tcpdump-4.9.0/print-ipoib.c	2017-01-29 13:24:49.576498883 +0000
[email protected]@ -0,0 +1,131 @@
 +/*
 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 
 + *	1997, 2000, 2011, 2012
@@ -83,29 +76,28 @@
 +#include "config.h"
 +#endif
 +
-+#include <tcpdump-stdinc.h>
++#include <netdissect-stdinc.h>
 +
 +#include <stdio.h>
 +#include <pcap.h>
 +
-+#include "interface.h"
++#include "netdissect.h"
 +#include "extract.h"
 +#include "addrtoname.h"
 +
 +
 +extern const struct tok ethertype_values[];
-+extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int );
 +
 +#define	IPOIB_HDRLEN	44
 +
 +static inline void
-+ipoib_hdr_print(register const u_char *bp, u_int length)
++ipoib_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 +{
 +	u_int16_t ether_type;
 +	char abuf[40];
 +
 +	ether_type = EXTRACT_16BITS(&bp[40]);
-+	if (!qflag) {
++	if (!ndo->ndo_qflag) {
 +		(void)printf(", ethertype %s (0x%04x)",
 +			     tok2str(ethertype_values,"Unknown", ether_type),
 +			     ether_type);
@@ -124,7 +116,7 @@
 + * frame's protocol, and an argument to pass to that function.
 + */
 +static void
-+ipoib_print(const u_char *p, u_int length, u_int caplen,
++ipoib_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 +    void (*print_encap_header)(const u_char *), const u_char *encap_header_arg)
 +{
 +	const u_char *orig_hdr = p;
@@ -137,10 +129,10 @@
 +		return;
 +	}
 +
-+	if (eflag) {
++	if (ndo->ndo_eflag) {
 +		if (print_encap_header != NULL)
 +			(*print_encap_header)(encap_header_arg);
-+		ipoib_hdr_print(p, length);
++		ipoib_hdr_print(ndo, p, length);
 +	}
 +	orig_length = length;
 +
@@ -149,16 +141,16 @@
 +	ether_type = EXTRACT_16BITS(&p[40]);
 +	p += IPOIB_HDRLEN;
 +
-+	if (ethertype_print(gndo, ether_type, p, length, caplen) == 0) {
++	if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {
 +		/* ether_type not known, print raw packet */
-+		if (!eflag) {
++		if (!ndo->ndo_eflag) {
 +			if (print_encap_header != NULL)
 +				(*print_encap_header)(encap_header_arg);
-+			ipoib_hdr_print(orig_hdr , orig_length);
++			ipoib_hdr_print(ndo, orig_hdr , orig_length);
 +		}
 +
-+		if (!suppress_default_print)
-+			default_print(p, caplen);
++		if (!ndo->ndo_suppress_default_print)
++			ND_DEFAULTPRINT(p, caplen);
 +	}
 +}
 +
@@ -171,7 +163,7 @@
 +u_int
 +ipoib_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 +{
-+	ipoib_print(p, h->len, h->caplen, NULL, NULL);
++	ipoib_print(ndo, p, h->len, h->caplen, NULL, NULL);
 +
 +	return (IPOIB_HDRLEN);
 +}
@@ -182,19 +174,14 @@
 + * c-basic-offset: 8
 + * End:
 + */
-diff -rupN tcpdump-4.7.4-orig/tcpdump.c tcpdump-4.7.4/tcpdump.c
---- tcpdump-4.7.4-orig/tcpdump.c	2015-05-26 14:13:17.000000000 -0700
-+++ tcpdump-4.7.4/tcpdump.c	2015-05-26 15:17:43.298240116 -0700
[email protected]@ -264,6 +264,13 @@ static const struct ndo_printer ndo_prin
+--- tcpdump-4.9.0/print.c.orig	2017-01-29 12:32:40.142061378 +0000
++++ tcpdump-4.9.0/print.c	2017-01-29 12:38:05.641526344 +0000
[email protected]@ -99,6 +99,9 @@
  #ifdef DLT_IPV6
  	{ raw_if_print,		DLT_IPV6 },
  #endif
 +#ifdef DLT_IPOIB
-+	{ ipoib_if_print, 	DLT_IPOIB },
-+	/* Following record is temporary at least till following bug is fixed in
-+	   all relevant releases:
-+	   22741013 - wrong value for DLT_IPOIB in dlt.h as in ON */
-+	{ ipoib_if_print, 	162 },
++	{ ipoib_if_print,       DLT_IPOIB },
 +#endif
  #ifdef HAVE_PCAP_USB_H
  #ifdef DLT_USB_LINUX
--- a/components/tcpdump/patches/fix-man-pages.patch	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/patches/fix-man-pages.patch	Fri Feb 17 12:07:20 2017 -0800
@@ -7,9 +7,9 @@
 all versions of Solaris. Until then, we are just using this Solaris 12
 specific patch.
 
---- tcpdump-4.7.4/configure.in.orig	2016-04-20 10:28:53.794215793 -0700
-+++ tcpdump-4.7.4/configure.in	2016-04-20 10:29:23.681239586 -0700
[email protected]@ -942,12 +942,6 @@
+--- tcpdump-4.9.0/configure.in.orig	2017-01-29 12:43:07.920555965 +0000
++++ tcpdump-4.9.0/configure.in	2017-01-29 12:43:40.563975267 +0000
[email protected]@ -735,13 +735,6 @@
  
  solaris*)
  	V_GROUP=sys
@@ -19,6 +19,7 @@
 -	#
 -	MAN_FILE_FORMATS=4
 -	MAN_MISC_INFO=5
- 	;;
+-	;;
  esac
  
+ if test -f /dev/bpf0 ; then
--- a/components/tcpdump/patches/man.patch	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/patches/man.patch	Fri Feb 17 12:07:20 2017 -0800
@@ -3,14 +3,14 @@
 
 Solaris specific documentation changes.
 
---- tcpdump-4.7.4/tcpdump.1.in.orig	Thu Apr 21 11:21:42 2016
-+++ tcpdump-4.7.4/tcpdump.1.in	Thu Apr 21 11:29:23 2016
+--- tcpdump-4.9.0/tcpdump.1.in.orig	2017-01-29 12:47:05.669888513 +0000
++++ tcpdump-4.9.0/tcpdump.1.in	2017-01-29 12:47:59.020079011 +0000
 @@ -20,7 +20,7 @@
  .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  .\"
--.TH TCPDUMP 1  "11 July 2014"
-+.TH TCPDUMP 8  "11 July 2014"
+-.TH TCPDUMP 1  "17 September 2015"
++.TH TCPDUMP 8  "17 September 2015"
  .SH NAME
  tcpdump \- dump traffic on a network
  .SH SYNOPSIS
@@ -23,9 +23,9 @@
  .IP
  If the
  .B \-D
---- tcpdump-4.7.4//Makefile.in	2016-06-15 14:27:29.370657670 -0700
-+++ tcpdump-4.7.4//Makefile.in	2016-06-15 14:26:30.183856767 -0700
[email protected]@ -409,13 +409,13 @@ install: all
+--- tcpdump-4.9.0/Makefile.in.orig	2017-01-29 12:23:58.596267167 +0000
++++ tcpdump-4.9.0/Makefile.in	2017-01-29 12:49:27.808281048 +0000
[email protected]@ -413,13 +414,13 @@
  	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION`
--- a/components/tcpdump/patches/system-test.patch	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/patches/system-test.patch	Fri Feb 17 12:07:20 2017 -0800
@@ -2,8 +2,8 @@
 
 This patch should be sent upstream.
 
---- tcpdump-4.7.4/tests/TESTonce.orig	2016-11-22 07:54:46.080609871 +0000
-+++ tcpdump-4.7.4/tests/TESTonce	2016-11-22 09:51:15.439509866 +0000
+--- tcpdump-4.9.0/tests/TESTonce.orig	2017-01-29 12:52:49.752631716 +0000
++++ tcpdump-4.9.0/tests/TESTonce	2017-01-29 14:48:33.249452168 +0000
 @@ -1,5 +1,7 @@
  #!/usr/bin/env perl
  
--- a/components/tcpdump/tcpdump.license	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/tcpdump.license	Fri Feb 17 12:07:20 2017 -0800
@@ -15,7 +15,7 @@
 Copyright (C) 2001 Fortress Technologies
 Copyright (C) 1991 Massachusetts Institute of Technology
 Copyright (C) 1990,1996 John Robert LoVersoi
-Copyright (C) 1999-2001 William C. Fenneri
+Copyright (C) 1999-2001 William C. Fenner
 Copyright (C) 1993 by Digital Equipment Corporation
 Copyright (C) 1998-2012  Michael Richardson <[email protected]>
 Copyright (C) 1993-1994 Jeffrey C. Mogul, Digital Equipment Corporation, Western Research Laboratory
@@ -56,6 +56,18 @@
 Copyright (c) 1999 Kungliga Tekniska Högskolan (Royal Institute of Technology, Stockholm, Sweden)
 Copyright (c) 2014 VMware, Inc.
 Copyright (c) 1986-2008 by Cisco Systems, Inc.
+Copyright (c) 1996-1999 by Internet Software Consortium.
+Copyright (c) 2004 Internet Systems Consortium, Inc. ("ISC")
+Copyright (c) 2007-2011 Grégoire Henry, Juliusz Chroboczeko
+Copyright (c) 2009 Florian Forster
+Copyright (c) 2009 Bert Vermeulen <[email protected]>
+Copyright (c) 2009 Mojatatu Networks, Inc
+Copyright (c) 2011 Advanced Computing Technologies
+Copyright (c) 2013 Petar Alilovic
+Copyright (c) 2013 Romain Francoise <[email protected]>
+Copyright (c) 2015 bugyo
+Copyright (c) 2015 Ritesh Ranjan ([email protected])
+Copyright (c) 2016 Antonin Décimo, Jean-Raphaël Gaglioneag
 
 
 
--- a/components/tcpdump/test/results-64.master	Thu Feb 16 08:04:08 2017 -0800
+++ b/components/tcpdump/test/results-64.master	Fri Feb 17 12:07:20 2017 -0800
@@ -1,171 +1,292 @@
-    esp1                          : TEST SKIPPED (compiled w/o OpenSSL)
-    esp2                          : TEST SKIPPED (compiled w/o OpenSSL)
-    esp3                          : TEST SKIPPED (compiled w/o OpenSSL)
-    esp4                          : TEST SKIPPED (compiled w/o OpenSSL)
-    esp5                          : TEST SKIPPED (compiled w/o OpenSSL)
-    espudp1                       : TEST SKIPPED (compiled w/o OpenSSL)
-    ikev2pI2                      : TEST SKIPPED (compiled w/o OpenSSL)
-    isakmp4                       : TEST SKIPPED (compiled w/o OpenSSL)
-    lmp-v                         : TEST SKIPPED (compiler is not GCC)
-    nflog-e                       : TEST SKIPPED (compiled w/o NFLOG)
-    print-x                       : passed
-    print-xx                      : passed
-    print-X                       : passed
-    print-XX                      : passed
-    print-A                       : passed
-    print-AA                      : passed
-    bgp_vpn_attrset               : passed
-    mpbgp-linklocal-nexthop       : passed
-    bgp_infloop-v                 : passed
-    eapon1                        : passed
-    esp0                          : passed
-    isakmp1                       : passed
-    isakmp2                       : passed
-    isakmp3                       : passed
-    isakmp5-v                     : passed
-    lmp                           : passed
-    mpls-ldp-hello                : passed
-    ldp_infloop                   : passed
-    ospf-gmpls                    : passed
-    ospf3_ah-vv                   : passed
-    ospf3_auth-vv                 : passed
-    ospf3_bc-vv                   : passed
-    ospf3_mp-vv                   : passed
-    ospf3_nbma-vv                 : passed
-    ikev2four                     : passed
-    ikev2fourv                    : passed
-    ikev2fourv4                   : passed
-    dio02                         : passed
-    dio03                         : passed
-    dao01                         : passed
-    daoack01                      : passed
-    e1000g                        : passed
-    forces01                      : passed
-    forces01vvv                   : passed
-    forces01vvvv                  : passed
-    qinq                          : passed
-    qinqv                         : passed
-    sflow1                        : passed
-    sflow2                        : passed
-    ahcp-vv                       : passed
-    babel1                        : passed
-    babel1v                       : passed
-    babel_auth                    : passed
-    babel_pad1                    : passed
-    babel_rtt                     : passed
-    pppoe                         : passed
-    pppoes                        : passed
-    pppoes_id                     : passed
-    igmpv1                        : passed
-    igmpv2                        : passed
-    igmpv3-queries                : passed
-    mtrace                        : passed
-    dvmrp                         : passed
-    icmpv6                        : passed
-    icmpv6_opt24-v                : passed
-    spb                           : passed
-    spb_bpduv4                    : passed
-    dcb_ets                       : passed
-    dcb_pfc                       : passed
-    dcb_qcn                       : passed
-    evb                           : passed
-    mstp-v                        : passed
-    stp-v                         : passed
-    rstp-v                        : passed
-    rpvst-v                       : passed
-    ripv1v2                       : passed
-    ripv2_auth                    : passed
-    dhcpv6-aftr-name              : passed
-    dhcpv6-ia-na                  : passed
-    dhcpv6-ia-pd                  : passed
-    dhcpv6-ia-ta                  : passed
-    dhcpv6-ntp-server             : passed
-    dhcpv6-sip-server-d           : passed
-    dhcpv6-domain-list            : passed
-    zmtp1v                        : passed
-    pgmv                          : passed
-    epgmv                         : passed
-    pgm_zmtp1v                    : passed
-    epgm_zmtp1v                   : passed
-    msnlb                         : passed
-    msnlb2                        : passed
-    mptcp                         : passed
-    mptcp-fclose                  : passed
-    tfo                           : passed
-    802.11_exthdr                 : passed
-    802.11_rx-stbc                : passed
-    of10_p3295-vv                 : passed
-    of10_s4810-vvvv               : passed
-    of10_pf5240-vv                : passed
-    of10_7050q-v                  : passed
-    of10_7050sx_bsn-vv            : passed
-    geonet-calm-fast              : passed
-    m3ua                          : passed
-    m3ua-vv                       : passed
-    syslog-v                      : passed
-    ipv6-bad-version.pcap         : passed
-    ipv6-routing-header           : passed
-    loopback                      : passed
-    dccp_partial_csum_v4_simple   : passed
-    dccp_partial_csum_v4_longer   : passed
-    dccp_partial_csum_v6_simple   : passed
-    dccp_partial_csum_v6_longer   : passed
-    vrrp                          : passed
-    vrrp-v                        : passed
-    hsrp_1                        : passed
-    hsrp_1-v                      : passed
-    hsrp_2-v                      : passed
-    hsrp_3-v                      : passed
-    pimv2_dm-v                    : passed
-    pimv2_register-v              : passed
-    pimv2_sm-v                    : passed
-    pimv2_bootstrap-v             : passed
-    pimv2_hellos-v                : passed
-    isis_infloop-v                : passed
-    rsvp_infloop-v                : passed
-    hdlc1                         : passed
-    hdlc2                         : passed
-    hdlc3                         : passed
-    hdlc4                         : passed
-    decnet                        : passed
-    radius-v                      : passed
-    radius-rfc4675                : passed
-    radius-rfc5176                : passed
-    dtp-v                         : passed
-    lacp-ev                       : passed
-    lldp_cdp-ev                   : passed
-    cdp-v                         : passed
-    udld-v                        : passed
-    eigrp1-v                      : passed
-    eigrp2-v                      : passed
-    eigrp3-v                      : passed
-    eigrp4-v                      : passed
-    isis_1                        : passed
-    isis_1-v                      : passed
-    isis_2-v                      : passed
-    isis_3-v                      : passed
-    isis_4-v                      : passed
-    aoe_1                         : passed
-    aoe_1-v                       : passed
-    geneve-v                      : passed
-    geneve-vni                    : passed
-    geneve-tcp                    : passed
-    dhcp-rfc3004                  : passed
-    dhcp-rfc5859                  : passed
-    kday1                         : passed
-    kday2                         : passed
-    kday3                         : passed
-    kday4                         : passed
-    kday5                         : passed
-    kday6                         : passed
-    kday7                         : passed
-    kday8                         : passed
-    cve2015-0261_01               : passed
-    cve2015-0261_02               : passed
+    esp1                               : TEST SKIPPED (compiled w/o OpenSSL)
+    esp2                               : TEST SKIPPED (compiled w/o OpenSSL)
+    esp3                               : TEST SKIPPED (compiled w/o OpenSSL)
+    esp4                               : TEST SKIPPED (compiled w/o OpenSSL)
+    esp5                               : TEST SKIPPED (compiled w/o OpenSSL)
+    espudp1                            : TEST SKIPPED (compiled w/o OpenSSL)
+    ikev2pI2                           : TEST SKIPPED (compiled w/o OpenSSL)
+    isakmp4                            : TEST SKIPPED (compiled w/o OpenSSL)
+    isis-seg-fault-1-v                 : TEST SKIPPED (compiler is not GCC)
+    lmp-v                              : TEST SKIPPED (compiler is not GCC)
+    nflog-e                            : TEST SKIPPED (compiled w/o NFLOG)
+    print-x                            : passed
+    print-xx                           : passed
+    print-X                            : passed
+    print-XX                           : passed
+    print-A                            : passed
+    print-AA                           : passed
+    bgp_vpn_attrset                    : passed
+    mpbgp-linklocal-nexthop            : passed
+    bgp_infloop-v                      : passed
+    bgp-aigp                           : passed
+    bgp-large-community                : passed
+    eapon1                             : passed
+    esp0                               : passed
+    isakmp1                            : passed
+    isakmp2                            : passed
+    isakmp3                            : passed
+    isakmp5-v                          : passed
+    lmp                                : passed
+    mpls-ldp-hello                     : passed
+    ldp_infloop                        : passed
+    lspping-fec-ldp                    : passed
+    lspping-fec-ldp-v                  : passed
+    lspping-fec-ldp-vv                 : passed
+    lspping-fec-rsvp                   : passed
+    lspping-fec-rsvp-v                 : passed
+    lspping-fec-rsvp-vv                : passed
+    mpls-traceroute                    : passed
+    mpls-traceroute-v                  : passed
+    ospf-gmpls                         : passed
+    ospf3_ah-vv                        : passed
+    ospf3_auth-vv                      : passed
+    ospf3_bc-vv                        : passed
+    ospf3_mp-vv                        : passed
+    ospf3_nbma-vv                      : passed
+    ospf2-seg-fault-1-v                : passed
+    ikev2four                          : passed
+    ikev2fourv                         : passed
+    ikev2fourv4                        : passed
+    ikev2pI2-segfault                  : passed
+    ikev2pI2-segfault-v                : passed
+    dio02                              : passed
+    dio03                              : passed
+    dao01                              : passed
+    daoack01                           : passed
+    e1000g                             : passed
+    forces01                           : passed
+    forces01vvv                        : passed
+    forces01vvvv                       : passed
+    qinq                               : passed
+    qinqv                              : passed
+    sflow1                             : passed
+    sflow2                             : passed
+    ahcp-vv                            : passed
+    babel1                             : passed
+    babel1v                            : passed
+    babel_auth                         : passed
+    babel_pad1                         : passed
+    babel_rtt                          : passed
+    pppoe                              : passed
+    pppoes                             : passed
+    pppoes_id                          : passed
+    truncated_aack                     : passed
+    igmpv1                             : passed
+    igmpv2                             : passed
+    igmpv3-queries                     : passed
+    mtrace                             : passed
+    dvmrp                              : passed
+    icmpv6                             : passed
+    icmpv6_opt24-v                     : passed
+    spb                                : passed
+    spb_bpduv4                         : passed
+    spb_bpduv4-v                       : passed
+    dcb_ets                            : passed
+    dcb_pfc                            : passed
+    dcb_qcn                            : passed
+    evb                                : passed
+    mstp-v                             : passed
+    stp-v                              : passed
+    rstp-v                             : passed
+    rpvst-v                            : passed
+    ripv1v2                            : passed
+    ripv2_auth                         : passed
+    dhcpv6-aftr-name                   : passed
+    dhcpv6-ia-na                       : passed
+    dhcpv6-ia-pd                       : passed
+    dhcpv6-ia-ta                       : passed
+    dhcpv6-ntp-server                  : passed
+    dhcpv6-sip-server-d                : passed
+    dhcpv6-domain-list                 : passed
+    dhcpv6-mud                         : passed
+    zmtp1v                             : passed
+    pgmv                               : passed
+    epgmv                              : passed
+    pgm_zmtp1v                         : passed
+    epgm_zmtp1v                        : passed
+    zmtp1-inf-loop-1                   : passed
+    msnlb                              : passed
+    msnlb2                             : passed
+    mptcp                              : passed
+    mptcp-fclose                       : passed
+    tfo                                : passed
+    scps_invalid                       : passed
+    802.11_exthdr                      : passed
+    802.11_rx-stbc                     : passed
+    of10_p3295-vv                      : passed
+    of10_s4810-vvvv                    : passed
+    of10_pf5240-vv                     : passed
+    of10_7050q-v                       : passed
+    of10_7050sx_bsn-vv                 : passed
+    geonet-calm-fast                   : passed
+    m3ua                               : passed
+    m3ua-vv                            : passed
+    syslog-v                           : passed
+    dnssec-vv                          : passed
+    ipv6-bad-version                   : passed
+    ipv6-routing-header                : passed
+    loopback                           : passed
+    dccp_partial_csum_v4_simple        : passed
+    dccp_partial_csum_v4_longer        : passed
+    dccp_partial_csum_v6_simple        : passed
+    dccp_partial_csum_v6_longer        : passed
+    vrrp                               : passed
+    vrrp-v                             : passed
+    hsrp_1                             : passed
+    hsrp_1-v                           : passed
+    hsrp_2-v                           : passed
+    hsrp_3-v                           : passed
+    pimv2_dm-v                         : passed
+    pimv2_register-v                   : passed
+    pimv2_sm-v                         : passed
+    pimv2_bootstrap-v                  : passed
+    pimv2_hellos-v                     : passed
+    isis_infloop-v                     : passed
+    isis_poi-v                         : passed
+    isis_poi2-v                        : passed
+    isis_1                             : passed
+    isis_1-v                           : passed
+    isis_2-v                           : passed
+    isis_3-v                           : passed
+    isis_4-v                           : passed
+    isis-seg-fault-2-v                 : passed
+    isis-seg-fault-3-v                 : passed
+    rsvp_infloop-v                     : passed
+    rsvp-inf-loop-2-v                  : passed
+    hdlc1                              : passed
+    hdlc2                              : passed
+    hdlc3                              : passed
+    hdlc4                              : passed
+    decnet                             : passed
+    radius-v                           : passed
+    radius-rfc4675                     : passed
+    radius-rfc5176                     : passed
+    radius-port1700                    : passed
+    dtp-v                              : passed
+    lacp-ev                            : passed
+    lldp_cdp-ev                        : passed
+    cdp-v                              : passed
+    udld-v                             : passed
+    lldp_mud-v                         : passed
+    lldp_mud-vv                        : passed
+    udld-inf-loop-1-v                  : passed
+    eigrp1-v                           : passed
+    eigrp2-v                           : passed
+    eigrp3-v                           : passed
+    eigrp4-v                           : passed
+    aoe_1                              : passed
+    aoe_1-v                            : passed
+    geneve-v                           : passed
+    geneve-vni                         : passed
+    geneve-tcp                         : passed
+    dhcp-rfc3004                       : passed
+    dhcp-rfc5859                       : passed
+    dhcp-mud                           : passed
+    medsa                              : passed
+    medsa-e                            : passed
+    vxlan                              : passed
+    cve-2014-8767-OLSR                 : passed
+    cve-2014-8768-Geonet               : passed
+    cve-2014-8769-AODV                 : passed
+    kday1                              : passed
+    kday2                              : passed
+    kday3                              : passed
+    kday4                              : passed
+    kday5                              : passed
+    kday6                              : passed
+    kday7                              : passed
+    kday8                              : passed
+    cve2015-0261_01                    : passed
+    cve2015-0261_02                    : passed
+    olsrv1_1                           : passed
+    unaligned-nfs-1                    : passed
+    lisp_eid_notify                    : passed
+    lisp_eid_register                  : passed
+    lisp_ipv6_eid                      : passed
+    pcap-invalid-version-1             : passed
+    pcap-invalid-version-2             : TEST FAILED
+    pcap-ng-invalid-vers-1             : passed
+    pcap-ng-invalid-vers-2             : TEST FAILED
+    nsh-over-vxlan-gpe                 : passed
+    nsh-over-vxlan-gpe-v               : passed
+    nsh-over-vxlan-gpe-vv              : passed
+    nsh-over-vxlan-gpe-vvv             : passed
+    resp_1                             : passed
+    resp_2                             : passed
+    resp_3                             : passed
+    hncp                               : passed
+    bfd-raw-auth-simple                : passed
+    bfd-raw-auth-simple-v              : passed
+    bfd-raw-auth-md5                   : passed
+    bfd-raw-auth-md5-v                 : passed
+    bfd-raw-auth-sha1                  : passed
+    bfd-raw-auth-sha1-v                : passed
+    heap-overflow-1                    : passed
+    heap-overflow-2                    : passed
+    heapoverflow-atalk_print           : passed
+    heapoverflow-EXTRACT_16BITS        : passed
+    heapoverflow-ppp_hdlc_if_print     : passed
+    heapoverflow-q933_printq           : passed
+    heapoverflow-sl_if_print           : passed
+    heapoverflow-ip_print_demux        : passed
+    heapoverflow-in_checksum           : passed
+    heapoverflow-tcp_print             : passed
+    gre-heapoverflow-1                 : passed
+    gre-heapoverflow-2                 : passed
+    calm-fast-mac-lookup-heapoverflow  : passed
+    geonet-mac-lookup-heapoverflow     : passed
+    radiotap-heapoverflow              : passed
+    isoclns-heapoverflow               : passed
+    tcp-auth-heapoverflow              : passed
+    frf15-heapoverflow                 : passed
+    atm-oam-heapoverflow               : passed
+    tcp_header_heapoverflow            : passed
+    ipcomp-heapoverflow                : passed
+    llc-xid-heapoverflow               : passed
+    udp-length-heapoverflow            : passed
+    aarp-heapoverflow-1                : passed
+    aarp-heapoverflow-2                : passed
+    mpls-label-heapoverflow            : passed
+    bad-ipv4-version-pgm-heapoverflow  : passed
+    stp-heapoverflow-1                 : passed
+    stp-heapoverflow-2                 : passed
+    stp-heapoverflow-3                 : passed
+    stp-heapoverflow-4                 : passed
+    stp-heapoverflow-5                 : passed
+    arp-too-long-tha                   : passed
+    juniper_header-heapoverflow        : passed
+    tftp-heapoverflow                  : passed
+    relts-0x80000000                   : passed
+    ipv6hdr-heapoverflow               : passed
+    ipv6hdr-heapoverflow-v             : passed
+    otv-heapoverflow-1                 : passed
+    otv-heapoverflow-2                 : passed
+    q933-heapoverflow-2                : passed
+    atm-heapoverflow                   : passed
+    snmp-heapoverflow-1                : passed
+    snmp-heapoverflow-2                : passed
+    isoclns-heapoverflow-2             : passed
+    isoclns-heapoverflow-3             : passed
+    rtp-seg-fault-1                    : passed
+    rtp-seg-fault-2                    : passed
+    nfs-seg-fault-1                    : passed
 ------------------------------------------------
-   0 tests failed
- 157 tests passed
+   2 tests failed
+ 263 tests passed
 
 
+Failed test: pcap-invalid-version-2
+
+1c1
+< EXIT CODE 00000100
+---
+> IP6 fe80::b299:28ff:fec8:d646.6696 > ff02::1:6.6696: babel 2 (424) hello update/id request tspc hmac hmac hmac hmac hmac hmac hmac hmac
+Failed test: pcap-ng-invalid-vers-2
+
+1c1
+< EXIT CODE 00000100
+---
+> IP6 fe80::20c:29ff:fe9e:c1b2 > ff02::5: OSPFv3, Hello, length 88
 
 
+make[1]: *** [Makefile:441: check] Error 2