Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

Conflicts:
	Makefile.in

diff --combined Makefile.in
index 7c46026e50865c2f9edf2da6c57bb3acf6a80079,4ec11b4793336943528dc8bdf57ca46d46cd0454..5c1e7a72acd9fa30123262c618970b6a78f311f8
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -72,7 -72,7 +72,7 @@@ CSRC =        addrtoname.c af.c checksum.c cpa
          nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
        print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
        print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
-       print-atm.c print-babel.c print-beep.c print-bfd.c print-bgp.c \
+       print-atm.c print-beep.c print-bfd.c print-bgp.c \
        print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c \
        print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
        print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
@@@ -168,6 -168,7 +168,7 @@@ HDR = 
        oui.h \
        pcap-missing.h \
        pmap_prot.h \
+       ppi.h \
        ppp.h \
        route6d.h \
        rpc_auth.h \
@@@ -244,6 -245,7 +245,7 @@@ EXTRA_DIST = 
        mkdep \
        packetdat.awk \
        pcap_dump_ftell.c \
+       print-babel.c \
        print-dhcp6.c \
        print-frag6.c \
        print-icmp6.c \
@@@ -261,9 -263,18 +263,18 @@@
        stime.awk \
        strcasecmp.c \
        tcpdump.1.in \
+       tests/02-sunrise-sunset-esp.pcap \
+       tests/08-sunrise-sunset-aes.pcap \
+       tests/08-sunrise-sunset-esp2.pcap \
+       tests/QinQpacket.out \
+       tests/QinQpacket.pcap \
+       tests/QinQpacketv.out \
        tests/TESTLIST \
        tests/TESTonce \
        tests/TESTrun.sh \
+       tests/babel.pcap \
+       tests/babel1.out \
+       tests/babel1v.out \
        tests/bgp-infinite-loop.pcap \
        tests/bgp_vpn_attrset.out \
        tests/bgp_vpn_attrset.pcap \
@@@ -275,8 -286,7 +286,7 @@@
        tests/e1000g.pcap \
        tests/eapon1.gdbinit \
        tests/eapon1.out \
-       tests/eapon1.puu \
-       tests/eapon2.puu \
+       tests/eapon1.pcap \
        tests/empty.uu \
        tests/esp-secrets.txt \
        tests/esp0.out \
@@@ -289,50 -299,54 +299,53 @@@
        tests/esp5.gdbinit \
        tests/esp5.out \
        tests/espudp1.out \
-       tests/espudp1.puu \
+       tests/espudp1.pcap \
        tests/forces1.out \
        tests/forces1.pcap \
        tests/forces1vvv.out \
        tests/forces1vvvv.out \
 -      tests/forces2.out \
        tests/forces2v.out \
        tests/forces2vv.out \
-       tests/ikev2.puu \
+       tests/forces3vvv.out \
        tests/ikev2four.out \
-       tests/ikev2four.puu \
+       tests/ikev2four.pcap \
        tests/ikev2fourv.out \
        tests/ikev2fourv4.out \
        tests/ikev2pI2-secrets.txt \
        tests/ikev2pI2.out \
-       tests/ikev2pI2.puu \
-       tests/isakmp-delete-segfault.puu \
-       tests/isakmp-identification-segfault.puu \
-       tests/isakmp-pointer-loop.puu \
+       tests/ikev2pI2.pcap \
+       tests/isakmp-delete-segfault.pcap \
+       tests/isakmp-identification-segfault.pcap \
+       tests/isakmp-pointer-loop.pcap \
        tests/isakmp1.out \
        tests/isakmp2.out \
        tests/isakmp3.out \
        tests/isakmp4.out \
-       tests/isakmp4500.puu \
+       tests/isakmp4500.pcap \
        tests/isis-infinite-loop.pcap \
        tests/ldp-infinite-loop.pcap \
+       tests/lmp.new \
        tests/lmp.out \
-       tests/lmp.puu \
+       tests/lmp.pcap \
        tests/lmp.sh \
        tests/lspping-fec-ldp.pcap \
        tests/lspping-fec-rsvp.pcap \
        tests/mpls-ldp-hello.out \
-       tests/mpls-ldp-hello.puu \
+       tests/mpls-ldp-hello.pcap \
        tests/mpls-traceroute.pcap \
        tests/ospf-gmpls.out \
-       tests/ospf-gmpls.puu \
+       tests/ospf-gmpls.pcap \
        tests/print-A.out \
        tests/print-AA.out \
        tests/print-capX.out \
        tests/print-capXX.out \
-       tests/print-flags.puu \
+       tests/print-flags.pcap \
        tests/print-flags.sh \
        tests/print-x.out \
        tests/print-xx.out \
        tests/rsvp-infinite-loop.pcap \
+       tests/sflow_multiple_counter_30_pdus.out \
+       tests/sflow_multiple_counter_30_pdus.pcap \
        vfprintf.c \
        win32/Include/bittypes.h \
        win32/Include/errno.h \