From: Bill Fenner <fenner@gmail.com>
Date: Fri, 22 Feb 2013 19:51:33 +0000 (-0800)
Subject: Merge branch 'master' of git://github.com/mcr/tcpdump
X-Git-Tag: tcpdump-4.4.0^2~4^2
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/a945058fa79c1bba7adf12268d9d2baa56e35316

Merge branch 'master' of git://github.com/mcr/tcpdump

Conflicts:
	tests/TESTLIST
---

a945058fa79c1bba7adf12268d9d2baa56e35316
diff --cc tests/TESTLIST
index c978f4a6,aed8e064..7e48b200
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@@ -65,5 -65,24 +66,27 @@@ babel_auth      babel_auth.pcap        
  # PPPoE tests
  pppoe           pppoe.pcap             pppoe.out       -t
  
 +# IGMP tests
 +igmpv3-queries  igmpv3-queries.pcap     igmpv3-queries.out      -t
++
+ # ICMPv6
+ icmpv6          icmpv6.pcap             icmpv6.out      -t -vv
+ 
+ # SPB tests
+ spb	            spb.pcap	            spb.out -t
+ 
+ # SPB BPDUv4 tests
+ spb_bpduv4      spb_bpduv4.pcap       spb_bpduv4.out -t
+ 
+ # RIP tests
+ ripv1v2         ripv1v2.pcap            ripv1v2.out     -t -v
+ ripv2_auth      ripv2_auth.pcap         ripv2_auth.out  -t -v
+ 
+ # DHCPv6 tests
+ dhcpv6-aftr-name	dhcpv6-AFTR-Name-RFC6334.pcap	dhcpv6-AFTR-Name-RFC6334.out	-t -v
+ dhcpv6-ia-na	dhcpv6-ia-na.pcap	dhcpv6-ia-na.out	-t -v
+ dhcpv6-ia-pd	dhcpv6-ia-pd.pcap	dhcpv6-ia-pd.out	-t -v
+ dhcpv6-ia-ta	dhcpv6-ia-ta.pcap	dhcpv6-ia-ta.out	-t -v
+ 
+ # ZeroMQ tests
+ zmtp1v		zmtp1.pcap		zmtp1.out	-t -v -T zmtp1