Module Name:	src
Committed By:	drochner
Date:		Tue Jul 24 11:44:21 UTC 2007

Update of /cvsroot/src/dist/tcpdump
In directory ivanova.netbsd.org:/tmp/cvs-serv20435

Log Message:
import tcpdump-3.9.7 (after running the tcpdump2netbsd script and
defusing NetBSD id strings used as reference)


Vendor Tag:	TCPDUMP
Release Tags:	v397
		
C src/dist/tcpdump/icmp6.h
C src/dist/tcpdump/print-atm.c
U src/dist/tcpdump/nfsfh.h
C src/dist/tcpdump/print-icmp6.c
C src/dist/tcpdump/print-ntp.c
C src/dist/tcpdump/ieee802_11_radio.h
U src/dist/tcpdump/mib.h
C src/dist/tcpdump/print-hsrp.c
U src/dist/tcpdump/print-mobility.c
U src/dist/tcpdump/Makefile-devel-adds
C src/dist/tcpdump/cpack.h
C src/dist/tcpdump/print-pim.c
U src/dist/tcpdump/ipproto.h
C src/dist/tcpdump/print-rip.c
U src/dist/tcpdump/smb.h
N src/dist/tcpdump/print-eap.c
U src/dist/tcpdump/bootp.h
N src/dist/tcpdump/rpc_auth.h
C src/dist/tcpdump/print-beep.c
N src/dist/tcpdump/pmap_prot.h
C src/dist/tcpdump/parsenfsfh.c
U src/dist/tcpdump/LICENSE
U src/dist/tcpdump/sctpConstants.h
N src/dist/tcpdump/nlpid.h
N src/dist/tcpdump/print-olsr.c
C src/dist/tcpdump/print-rt6.c
U src/dist/tcpdump/oui.c
C src/dist/tcpdump/print-smb.c
U src/dist/tcpdump/PLATFORMS
U src/dist/tcpdump/config.h.in
C src/dist/tcpdump/tcpdump.8
C src/dist/tcpdump/print-telnet.c
C src/dist/tcpdump/machdep.c
C src/dist/tcpdump/print-ip.c
N src/dist/tcpdump/l2vpn.c
U src/dist/tcpdump/ieee802_11.h
U src/dist/tcpdump/ether.h
C src/dist/tcpdump/print-ipx.c
U src/dist/tcpdump/ospf.h
C src/dist/tcpdump/print-cip.c
U src/dist/tcpdump/oakley.h
U src/dist/tcpdump/tcpdump-stdinc.h
U src/dist/tcpdump/print-aodv.c
C src/dist/tcpdump/nfs.h
U src/dist/tcpdump/config.sub
C src/dist/tcpdump/ip6.h
N src/dist/tcpdump/rpc_msg.h
U src/dist/tcpdump/sctpHeader.h
C src/dist/tcpdump/gmt2local.c
C src/dist/tcpdump/extract.h
U src/dist/tcpdump/enc.h
N src/dist/tcpdump/Readme.Win32
U src/dist/tcpdump/print-sunatm.c
U src/dist/tcpdump/ipx.h
C src/dist/tcpdump/ip.h
N src/dist/tcpdump/pcap_dump_ftell.c
C src/dist/tcpdump/print-frag6.c
U src/dist/tcpdump/setsignal.h
U src/dist/tcpdump/send-ack.awk
C src/dist/tcpdump/print-chdlc.c
C src/dist/tcpdump/print-netbios.c
C src/dist/tcpdump/print-ppp.c
N src/dist/tcpdump/af.h
U src/dist/tcpdump/packetdat.awk
C src/dist/tcpdump/print-tcp.c
U src/dist/tcpdump/token.h
C src/dist/tcpdump/print-arp.c
U src/dist/tcpdump/l2tp.h
C src/dist/tcpdump/smbutil.c
N src/dist/tcpdump/print-symantec.c
C src/dist/tcpdump/print-lane.c
C src/dist/tcpdump/nameser.h
C src/dist/tcpdump/print-802_11.c
N src/dist/tcpdump/netdissect.h
C src/dist/tcpdump/tcp.h
U src/dist/tcpdump/CHANGES
C src/dist/tcpdump/print-sunrpc.c
C src/dist/tcpdump/print-esp.c
U src/dist/tcpdump/Makefile.in
U src/dist/tcpdump/pcap-missing.h
C src/dist/tcpdump/print-rx.c
U src/dist/tcpdump/machdep.h
C src/dist/tcpdump/print-raw.c
C src/dist/tcpdump/print-lwres.c
C src/dist/tcpdump/print-tftp.c
N src/dist/tcpdump/print-slow.c
U src/dist/tcpdump/ppp.h
N src/dist/tcpdump/print-sip.c
C src/dist/tcpdump/print-msdp.c
N src/dist/tcpdump/l2vpn.h
C src/dist/tcpdump/print-sll.c
C src/dist/tcpdump/interface.h
C src/dist/tcpdump/print-sctp.c
C src/dist/tcpdump/print-udp.c
U src/dist/tcpdump/TODO
U src/dist/tcpdump/llc.h
C src/dist/tcpdump/INSTALL
U src/dist/tcpdump/print-ap1394.c
C src/dist/tcpdump/print-token.c
U src/dist/tcpdump/addrtoname.h
U src/dist/tcpdump/mkdep
U src/dist/tcpdump/acconfig.h
U src/dist/tcpdump/print-ipfc.c
N src/dist/tcpdump/nlpid.c
C src/dist/tcpdump/print-null.c
U src/dist/tcpdump/print-enc.c
C src/dist/tcpdump/print-egp.c
U src/dist/tcpdump/atm.h
C src/dist/tcpdump/print-pppoe.c
C src/dist/tcpdump/setsignal.c
U src/dist/tcpdump/aodv.h
U src/dist/tcpdump/atime.awk
U src/dist/tcpdump/sll.h
C src/dist/tcpdump/vfprintf.c
C src/dist/tcpdump/print-fddi.c
U src/dist/tcpdump/slip.h
U src/dist/tcpdump/aclocal.m4
U src/dist/tcpdump/igrp.h
C src/dist/tcpdump/print-ospf.c
U src/dist/tcpdump/oui.h
U src/dist/tcpdump/appletalk.h
U src/dist/tcpdump/lane.h
U src/dist/tcpdump/gmpls.c
C src/dist/tcpdump/print-pflog.c
C src/dist/tcpdump/print-llc.c
U src/dist/tcpdump/gmt2local.h
C src/dist/tcpdump/print-radius.c
C src/dist/tcpdump/print-cdp.c
N src/dist/tcpdump/print-pgm.c
U src/dist/tcpdump/timed.h
N src/dist/tcpdump/af.c
C src/dist/tcpdump/print-ospf6.c
U src/dist/tcpdump/print-bfd.c
C src/dist/tcpdump/print-atalk.c
C src/dist/tcpdump/addrtoname.c
C src/dist/tcpdump/print-sl.c
C src/dist/tcpdump/print-ascii.c
U src/dist/tcpdump/FILES
C src/dist/tcpdump/print-domain.c
U src/dist/tcpdump/README
N src/dist/tcpdump/print-lspping.c
U src/dist/tcpdump/route6d.h
N src/dist/tcpdump/dccp.h
N src/dist/tcpdump/print-dccp.c
C src/dist/tcpdump/print-krb.c
C src/dist/tcpdump/print-isoclns.c
U src/dist/tcpdump/print-fr.c
C src/dist/tcpdump/telnet.h
C src/dist/tcpdump/print-timed.c
N src/dist/tcpdump/print-lmp.c
U src/dist/tcpdump/ethertype.h
C src/dist/tcpdump/print-l2tp.c
C src/dist/tcpdump/strcasecmp.c
U src/dist/tcpdump/CREDITS
U src/dist/tcpdump/makemib
U src/dist/tcpdump/pf.h
C src/dist/tcpdump/print-nfs.c
C src/dist/tcpdump/configure
N src/dist/tcpdump/mpls.h
C src/dist/tcpdump/print-zephyr.c
C src/dist/tcpdump/print-bootp.c
C src/dist/tcpdump/print-vjc.c
U src/dist/tcpdump/netbios.h
C src/dist/tcpdump/print-ip6.c
C src/dist/tcpdump/print-bgp.c
N src/dist/tcpdump/print-juniper.c
C src/dist/tcpdump/print-decnet.c
U src/dist/tcpdump/esp.h
N src/dist/tcpdump/ipproto.c
C src/dist/tcpdump/print-arcnet.c
C src/dist/tcpdump/print-stp.c
C src/dist/tcpdump/udp.h
C src/dist/tcpdump/print-isakmp.c
U src/dist/tcpdump/stime.awk
U src/dist/tcpdump/fddi.h
C src/dist/tcpdump/print-dvmrp.c
C src/dist/tcpdump/print-ipcomp.c
C src/dist/tcpdump/cpack.c
U src/dist/tcpdump/ipsec_doi.h
C src/dist/tcpdump/print-wb.c
U src/dist/tcpdump/print-ldp.c
U src/dist/tcpdump/arcnet.h
C src/dist/tcpdump/util.c
U src/dist/tcpdump/gmpls.h
U src/dist/tcpdump/ah.h
C src/dist/tcpdump/print-icmp.c
C src/dist/tcpdump/print-ether.c
N src/dist/tcpdump/print-syslog.c
U src/dist/tcpdump/print-rsvp.c
C src/dist/tcpdump/print-gre.c
C src/dist/tcpdump/print-igrp.c
C src/dist/tcpdump/print-ip6opts.c
C src/dist/tcpdump/print-mpls.c
U src/dist/tcpdump/isakmp.h
N src/dist/tcpdump/bgp.h
C src/dist/tcpdump/print-ah.c
U src/dist/tcpdump/chdlc.h
C src/dist/tcpdump/print-pptp.c
U src/dist/tcpdump/atmuni31.h
C src/dist/tcpdump/bpf_dump.c
C src/dist/tcpdump/configure.in
C src/dist/tcpdump/print-igmp.c
C src/dist/tcpdump/print-snmp.c
U src/dist/tcpdump/install-sh
U src/dist/tcpdump/config.guess
U src/dist/tcpdump/ipfc.h
C src/dist/tcpdump/print-mobile.c
U src/dist/tcpdump/ospf6.h
U src/dist/tcpdump/VERSION
C src/dist/tcpdump/print-dhcp6.c
C src/dist/tcpdump/print-ripng.c
U src/dist/tcpdump/slcompress.h
C src/dist/tcpdump/tcpdump.c
C src/dist/tcpdump/print-cnfp.c
N src/dist/tcpdump/decode_prefix.h
N src/dist/tcpdump/print-eigrp.c
U src/dist/tcpdump/decnet.h
U src/dist/tcpdump/ntp.h
U src/dist/tcpdump/rx.h
C src/dist/tcpdump/print-vrrp.c

106 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jTCPDUMP:yesterday -jTCPDUMP src/dist/tcpdump