Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/tcpdump/dist Monday March. 11, 2015 guy%alum.mi@localhost...
details: https://anonhg.NetBSD.org/src/rev/05a7dc196dc7
branches: trunk
changeset: 337071:05a7dc196dc7
user: christos <christos%NetBSD.org@localhost>
date: Tue Mar 31 21:45:44 2015 +0000
description:
Monday March. 11, 2015 guy%alum.mit.edu@localhost
Summary for 4.7.3 tcpdump release
Capsicum fixes for FreeBSD 10
Monday March. 10, 2015 guy%alum.mit.edu@localhost
Summary for 4.7.2 tcpdump release
DCCP: update Packet Types with RFC4340/IANA names
fixes for CVE-2015-0261: IPv6 mobility header check issue
fixes for CVE-2015-2153, 2154, 2155: kday packets
Friday Nov. 12, 2014 guy%alum.mit.edu@localhost
Summary for 4.7.0 tcpdump release
changes to hex printing of CDP packets
Fix PPI printing
Radius: update Packet Type Codes and Attribute Types with RFC/IANA names
Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support.
improvements to telnet printer, even if not -v
omit length for bcp, print-tcp uses it
formatting fixes for a bunch of protocols
new bounds checks for a number of protocols
split netflow 1,6, and 6 dissector up.
added geneve dissector
CVE-2014-9140 PPP dissector fixed.
diffstat:
external/bsd/tcpdump/dist/CHANGES | 25 +
external/bsd/tcpdump/dist/CREDITS | 4 +-
external/bsd/tcpdump/dist/INSTALL.txt | 1 -
external/bsd/tcpdump/dist/Makefile.in | 9 +-
external/bsd/tcpdump/dist/VERSION | 2 +-
external/bsd/tcpdump/dist/aclocal.m4 | 94 +-
external/bsd/tcpdump/dist/addrtoname.h | 1 +
external/bsd/tcpdump/dist/config.guess | 373 ++----
external/bsd/tcpdump/dist/config.h.in | 17 +-
external/bsd/tcpdump/dist/config.sub | 128 +-
external/bsd/tcpdump/dist/missing/strsep.c | 2 +
external/bsd/tcpdump/dist/mkdep | 3 -
external/bsd/tcpdump/dist/openflow.h | 11 +
external/bsd/tcpdump/dist/oui.h | 9 +
external/bsd/tcpdump/dist/print-babel.c | 9 +-
external/bsd/tcpdump/dist/print-ftp.c | 35 +
external/bsd/tcpdump/dist/print-geneve.c | 223 ++++
external/bsd/tcpdump/dist/print-geonet.c | 280 ++--
external/bsd/tcpdump/dist/print-http.c | 80 +
external/bsd/tcpdump/dist/print-ipnet.c | 2 -
external/bsd/tcpdump/dist/print-nflog.c | 4 +-
external/bsd/tcpdump/dist/print-olsr.c | 58 +-
external/bsd/tcpdump/dist/print-openflow-1.0.c | 546 +++++++++-
external/bsd/tcpdump/dist/print-openflow.c | 29 +-
external/bsd/tcpdump/dist/print-ppi.c | 26 +-
external/bsd/tcpdump/dist/print-rpki-rtr.c | 13 +-
external/bsd/tcpdump/dist/print-rtsp.c | 50 +
external/bsd/tcpdump/dist/print-smtp.c | 30 +
external/bsd/tcpdump/dist/print-vxlan.c | 4 +-
external/bsd/tcpdump/dist/print-zeromq.c | 12 +-
external/bsd/tcpdump/dist/tests/RADIUS-RFC4675.pcap | Bin
external/bsd/tcpdump/dist/tests/RADIUS-RFC5176.pcap | Bin
external/bsd/tcpdump/dist/tests/TESTLIST | 36 +-
external/bsd/tcpdump/dist/tests/TESTonce | 40 +-
external/bsd/tcpdump/dist/tests/TESTrun.sh | 1 +
external/bsd/tcpdump/dist/tests/bgp_infloop-v.out | 10 +-
external/bsd/tcpdump/dist/tests/bgp_vpn_attrset.out | 2 +-
external/bsd/tcpdump/dist/tests/cdp-v.out | 90 +-
external/bsd/tcpdump/dist/tests/crypto.sh | 21 +-
external/bsd/tcpdump/dist/tests/cve2015-0261-crash.out | 1 +
external/bsd/tcpdump/dist/tests/cve2015-0261-crash.pcap | Bin
external/bsd/tcpdump/dist/tests/cve2015-0261-ipv6.out | 3 +
external/bsd/tcpdump/dist/tests/cve2015-0261-ipv6.pcap | Bin
external/bsd/tcpdump/dist/tests/dccp_partial_csum_v4_longer.out | 30 +-
external/bsd/tcpdump/dist/tests/dccp_partial_csum_v4_simple.out | 14 +-
external/bsd/tcpdump/dist/tests/dccp_partial_csum_v6_longer.out | 18 +-
external/bsd/tcpdump/dist/tests/dccp_partial_csum_v6_simple.out | 14 +-
external/bsd/tcpdump/dist/tests/dhcp-rfc3004-v.out | 55 +
external/bsd/tcpdump/dist/tests/dhcp-rfc3004.pcap | Bin
external/bsd/tcpdump/dist/tests/dhcp-rfc5859-v.out | 44 +
external/bsd/tcpdump/dist/tests/dhcp-rfc5859.pcap | Bin
external/bsd/tcpdump/dist/tests/forces1vvv.out | 20 +-
external/bsd/tcpdump/dist/tests/forces1vvvv.out | 20 +-
external/bsd/tcpdump/dist/tests/geneve-tcp.out | 33 +
external/bsd/tcpdump/dist/tests/geneve-vni.out | 20 +
external/bsd/tcpdump/dist/tests/geneve-vv.out | 156 ++
external/bsd/tcpdump/dist/tests/geneve.pcap | Bin
external/bsd/tcpdump/dist/tests/kday1.out | 15 +
external/bsd/tcpdump/dist/tests/kday1.pcap | Bin
external/bsd/tcpdump/dist/tests/kday2.out | 27 +
external/bsd/tcpdump/dist/tests/kday2.pcap | Bin
external/bsd/tcpdump/dist/tests/kday3.out | 20 +
external/bsd/tcpdump/dist/tests/kday3.pcap | Bin
external/bsd/tcpdump/dist/tests/kday4.out | 28 +
external/bsd/tcpdump/dist/tests/kday4.pcap | Bin
external/bsd/tcpdump/dist/tests/kday5.out | 27 +
external/bsd/tcpdump/dist/tests/kday5.pcap | Bin
external/bsd/tcpdump/dist/tests/kday6.out | 460 ++++++++
external/bsd/tcpdump/dist/tests/kday6.pcap | Bin
external/bsd/tcpdump/dist/tests/kday7.out | 28 +
external/bsd/tcpdump/dist/tests/kday7.pcap | Bin
external/bsd/tcpdump/dist/tests/kday8.out | 27 +
external/bsd/tcpdump/dist/tests/kday8.pcap | Bin
external/bsd/tcpdump/dist/tests/lldp_cdp-ev.out | 100 +-
external/bsd/tcpdump/dist/tests/lmp-v.sh | 7 +-
external/bsd/tcpdump/dist/tests/mpbgp-linklocal-nexthop.out | 2 +-
external/bsd/tcpdump/dist/tests/of10_7050q-v.out | 16 +-
external/bsd/tcpdump/dist/tests/of10_7050sx_bsn-vv.out | 343 ++++++
external/bsd/tcpdump/dist/tests/of10_7050sx_bsn.pcap | Bin
external/bsd/tcpdump/dist/tests/of10_p3295-vv.out | 6 +-
external/bsd/tcpdump/dist/tests/print-A.out | 4 +-
external/bsd/tcpdump/dist/tests/print-AA.out | 4 +-
external/bsd/tcpdump/dist/tests/print-capX.out | 4 +-
external/bsd/tcpdump/dist/tests/print-capXX.out | 4 +-
external/bsd/tcpdump/dist/tests/print-x.out | 4 +-
external/bsd/tcpdump/dist/tests/print-xx.out | 4 +-
external/bsd/tcpdump/dist/tests/radius-rfc4675-v.out | 43 +
external/bsd/tcpdump/dist/tests/radius-rfc5176-v.out | 24 +
external/bsd/tcpdump/dist/tests/radius-v.out | 74 +-
external/bsd/tcpdump/dist/tests/rpl-14-daovvv.out | 2 +-
external/bsd/tcpdump/dist/tests/rpl-19-pickdag.out | 2 +-
external/bsd/tcpdump/dist/tests/rpl-19-pickdagvvv.out | 2 +-
92 files changed, 3203 insertions(+), 782 deletions(-)
diffs (truncated from 5799 to 300 lines):
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/CHANGES
--- a/external/bsd/tcpdump/dist/CHANGES Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/CHANGES Tue Mar 31 21:45:44 2015 +0000
@@ -1,4 +1,29 @@
+Monday March. 11, 2015 guy%alum.mit.edu@localhost
+ Summary for 4.7.3 tcpdump release
+ Capsicum fixes for FreeBSD 10
+
+Monday March. 10, 2015 guy%alum.mit.edu@localhost
+ Summary for 4.7.2 tcpdump release
+ DCCP: update Packet Types with RFC4340/IANA names
+ fixes for CVE-2015-0261: IPv6 mobility header check issue
+ fixes for CVE-2015-2153, 2154, 2155: kday packets
+
+Friday Nov. 12, 2014 guy%alum.mit.edu@localhost
+ Summary for 4.7.0 tcpdump release
+ changes to hex printing of CDP packets
+ Fix PPI printing
+ Radius: update Packet Type Codes and Attribute Types with RFC/IANA names
+ Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support.
+ improvements to telnet printer, even if not -v
+ omit length for bcp, print-tcp uses it
+ formatting fixes for a bunch of protocols
+ new bounds checks for a number of protocols
+ split netflow 1,6, and 6 dissector up.
+ added geneve dissector
+ CVE-2014-9140 PPP dissector fixed.
+
Tuesday Sep. 2, 2014 mcr%sandelman.ca@localhost
+ Summary for 4.6.2 tcpdump release
fix out-of-source-tree builds: find libpcap that is out of source
better configure check for libsmi
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/CREDITS
--- a/external/bsd/tcpdump/dist/CREDITS Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/CREDITS Tue Mar 31 21:45:44 2015 +0000
@@ -2,7 +2,7 @@
The current maintainers:
Bill Fenner <fenner at research dot att dot com>
- Denis Ovsienko <infrastation at yandex dot ru>
+ Denis Ovsienko <denis at ovsienko dot info>
Fulvio Risso <risso at polito dot it>
Guy Harris <guy at alum dot mit dot edu>
Hannes Gredler <hannes at juniper dot net>
@@ -85,6 +85,7 @@
Harry Raaymakers <harryr at connect dot com dot au>
Heinz-Ado Arnolds <Ado dot Arnolds at dhm-systems dot de>
Hendrik Scholz <hendrik at scholz dot net>
+ Herwin Weststrate <herwin at quarantainenet dot nl>
Ian McDonald <imcdnzl at gmail dot com>
Ilpo Järvinen <ilpo dot jarvinen at helsinki dot fi>
Jacek Tobiasz <Jacek dot Tobiasz at atm dot com dot pl>
@@ -95,6 +96,7 @@
Jefferson Ogata <jogata at nodc dot noaa dot gov>
Jeffrey Hutzelman <jhutz at cmu dot edu>
Jesper Peterson <jesper at endace dot com>
+ Jesse Gross <jesse at nicira dot com>
Jim Hutchins <jim at ca dot sandia dot gov>
João Medeiros <ignotus21 at sourceforge dot net>
Joerg Mayer <jmayer at loplof dot de>
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/INSTALL.txt
--- a/external/bsd/tcpdump/dist/INSTALL.txt Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/INSTALL.txt Tue Mar 31 21:45:44 2015 +0000
@@ -52,7 +52,6 @@
atime.awk - TCP ack awk script
atm.h - ATM traffic type definitions
atmuni31.h - ATM Q.2931 definitions
-bootp.h - BOOTP definitions
bpf_dump.c - BPF program printing routines, in case libpcap doesn't
have them
chdlc.h - Cisco HDLC definitions
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/Makefile.in
--- a/external/bsd/tcpdump/dist/Makefile.in Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/Makefile.in Tue Mar 31 21:45:44 2015 +0000
@@ -124,13 +124,17 @@
print-fddi.c \
print-forces.c \
print-fr.c \
+ print-ftp.c \
+ print-geneve.c \
print-geonet.c \
print-gre.c \
print-hsrp.c \
+ print-http.c \
print-icmp.c \
print-igmp.c \
print-igrp.c \
print-ip.c \
+ print-ip6.c \
print-ipcomp.c \
print-ipfc.c \
print-ipnet.c \
@@ -178,6 +182,7 @@
print-rpki-rtr.c \
print-rrcp.c \
print-rsvp.c \
+ print-rtsp.c \
print-rx.c \
print-sctp.c \
print-sflow.c \
@@ -185,6 +190,7 @@
print-sl.c \
print-sll.c \
print-slow.c \
+ print-smtp.c \
print-snmp.c \
print-stp.c \
print-sunatm.c \
@@ -231,7 +237,6 @@
appletalk.h \
atm.h \
atmuni31.h \
- bootp.h \
chdlc.h \
cpack.h \
ether.h \
@@ -241,7 +246,6 @@
gmpls.h \
gmt2local.h \
interface.h \
- interface.h \
ip.h \
ip6.h \
ipproto.h \
@@ -330,7 +334,6 @@
print-dhcp6.c \
print-frag6.c \
print-icmp6.c \
- print-ip6.c \
print-ip6opts.c \
print-mobility.c \
print-ospf6.c \
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/VERSION
--- a/external/bsd/tcpdump/dist/VERSION Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/VERSION Tue Mar 31 21:45:44 2015 +0000
@@ -1,1 +1,1 @@
-4.6.2
+4.7.3
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/aclocal.m4
--- a/external/bsd/tcpdump/dist/aclocal.m4 Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/aclocal.m4 Tue Mar 31 21:45:44 2015 +0000
@@ -438,27 +438,31 @@
LIBS="$LIBS $pfopen"
fi
fi
- AC_MSG_CHECKING(for local pcap library)
- libpcap=FAIL
- lastdir=FAIL
- places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
- egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
- places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
- egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
- for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
- basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
- sed -e 's/-PRE-GIT$//' `
- if test $lastdir = $basedir ; then
- dnl skip alphas when an actual release is present
- continue;
- fi
- lastdir=$dir
- if test -r $dir/libpcap.a ; then
- libpcap=$dir/libpcap.a
- d=$dir
- dnl continue and select the last one that exists
- fi
- done
+ libpcap=FAIL
+ AC_MSG_CHECKING(for local pcap library)
+ AC_ARG_WITH([system-libpcap],
+ [AS_HELP_STRING([--with-system-libpcap], [don't use local pcap library])])
+ if test "x$with_system_libpcap" != xyes ; then
+ lastdir=FAIL
+ places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
+ egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
+ places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
+ egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
+ for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
+ basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
+ sed -e 's/-PRE-GIT$//' `
+ if test $lastdir = $basedir ; then
+ dnl skip alphas when an actual release is present
+ continue;
+ fi
+ lastdir=$dir
+ if test -r $dir/libpcap.a ; then
+ libpcap=$dir/libpcap.a
+ d=$dir
+ dnl continue and select the last one that exists
+ fi
+ done
+ fi
if test $libpcap = FAIL ; then
AC_MSG_RESULT(not found)
@@ -620,54 +624,6 @@
able to fix it, without that information, as we have not been able to
reproduce this problem ourselves.])
])
-
- dnl
- dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()",
- dnl and "pcap_datalink_name_to_val()", and use substitute versions
- dnl if they're not present.
- dnl
- AC_CHECK_FUNC(pcap_list_datalinks,
- [
- AC_DEFINE(HAVE_PCAP_LIST_DATALINKS, 1,
- [define if libpcap has pcap_list_datalinks()])
- AC_CHECK_FUNCS(pcap_free_datalinks)
- ],
- [
- AC_LIBOBJ(datalinks)
- ])
- AC_CHECK_FUNCS(pcap_set_datalink)
- AC_CHECK_FUNC(pcap_datalink_name_to_val,
- [
- AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL, 1,
- [define if libpcap has pcap_datalink_name_to_val()])
- AC_CHECK_FUNC(pcap_datalink_val_to_description,
- AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION, 1,
- [define if libpcap has pcap_datalink_val_to_description()]),
- [
- AC_LIBOBJ(dlnames)
- ])
- ],
- [
- AC_LIBOBJ(dlnames)
- ])
-
- dnl
- dnl Check for "pcap_breakloop()"; you can't substitute for it if
- dnl it's absent (it has hooks into the live capture routines),
- dnl so just define the HAVE_ value if it's there.
- dnl
- AC_CHECK_FUNCS(pcap_breakloop)
-
- dnl
- dnl Check for "pcap_dump_ftell()" and use a substitute version
- dnl if it's not present.
- dnl
- AC_CHECK_FUNC(pcap_dump_ftell,
- AC_DEFINE(HAVE_PCAP_DUMP_FTELL, 1,
- [define if libpcap has pcap_dump_ftell()]),
- [
- AC_LIBOBJ(pcap_dump_ftell)
- ])
])
dnl
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/addrtoname.h
--- a/external/bsd/tcpdump/dist/addrtoname.h Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/addrtoname.h Tue Mar 31 21:45:44 2015 +0000
@@ -51,6 +51,7 @@
#ifdef INET6
extern struct h6namemem *newh6namemem(void);
#endif
+extern const char * ieee8021q_tci_string(const uint16_t);
#define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p))
#ifdef INET6
diff -r b9d127617d0b -r 05a7dc196dc7 external/bsd/tcpdump/dist/config.guess
--- a/external/bsd/tcpdump/dist/config.guess Tue Mar 31 21:42:16 2015 +0000
+++ b/external/bsd/tcpdump/dist/config.guess Tue Mar 31 21:45:44 2015 +0000
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2015-02-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches%gnu.org@localhost> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
Home |
Main Index |
Thread Index |
Old Index