CVS commit: src/external/bsd/tcpdump

To: source-changes%NetBSD.org@localhost
Subject: CVS commit: src/external/bsd/tcpdump
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Date: Tue, 24 Jan 2017 18:29:15 -0500
Module Name:    src
Committed By:   christos
Date:           Tue Jan 24 23:29:14 UTC 2017

Modified Files:
        src/external/bsd/tcpdump/bin: Makefile
        src/external/bsd/tcpdump/dist: addrtoname.c addrtostr.c af.c
            ascii_strcasecmp.c bpf_dump.c checksum.c configure configure.in
            cpack.c cpack.h ether.h gmpls.c gmt2local.c in_cksum.c interface.h
            ip.h ip6.h ipproto.c l2vpn.c machdep.c nameser.h netdissect.h
            nlpid.c oui.c parsenfsfh.c print-802_11.c print-802_15_4.c
            print-ah.c print-ahcp.c print-aodv.c print-aoe.c print-ap1394.c
            print-arcnet.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-bootp.c
            print-bt.c print-calm-fast.c print-carp.c print-cdp.c print-cfm.c
            print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c
            print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c
            print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c
            print-fddi.c print-forces.c print-fr.c print-frag6.c print-ftp.c
            print-geneve.c print-geonet.c print-gre.c print-hncp.c print-hsrp.c
            print-http.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c
            print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c
            print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c
            print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c
            print-lisp.c print-llc.c print-lldp.c print-lmp.c print-loopback.c
            print-lspping.c print-lwapp.c print-lwres.c print-m3ua.c
            print-medsa.c print-mobile.c print-mobility.c print-mpcp.c
            print-mpls.c print-mptcp.c print-msdp.c print-msnlb.c print-nflog.c
            print-nfs.c print-nsh.c print-ntp.c print-null.c print-olsr.c
            print-openflow-1.0.c print-openflow.c print-ospf.c print-ospf6.c
            print-otv.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c
            print-pktap.c print-ppi.c print-ppp.c print-pppoe.c print-pptp.c
            print-radius.c print-raw.c print-resp.c print-rip.c print-ripng.c
            print-rpki-rtr.c print-rrcp.c print-rsvp.c print-rt6.c print-rtsp.c
            print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c
            print-sll.c print-slow.c print-smb.c print-smtp.c print-snmp.c
            print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c
            print-syslog.c print-tcp.c print-telnet.c print-tftp.c
            print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c
            print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c
            print-vxlan-gpe.c print-vxlan.c print-wb.c print-zephyr.c
            print-zeromq.c print.c setsignal.c signature.c smbutil.c
            strtoaddr.c tcp.h tcpdump.1.in tcpdump.c udp.h util-print.c util.c
            vfprintf.c
        src/external/bsd/tcpdump/include: config.h
Removed Files:
        src/external/bsd/tcpdump/dist: atmuni31.h strcasecmp.c tcpdump-stdinc.h
        src/external/bsd/tcpdump/dist/missing: addrinfo.h getnameinfo.c
            inet_aton.c inet_ntop.c inet_pton.c
        src/external/bsd/tcpdump/dist/win32/Include: w32_fzs.h

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/dist/addrtoname.c \
    src/external/bsd/tcpdump/dist/print-isakmp.c \
    src/external/bsd/tcpdump/dist/print-lmp.c \
    src/external/bsd/tcpdump/dist/print-pim.c \
    src/external/bsd/tcpdump/dist/print-rsvp.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tcpdump/dist/addrtostr.c \
    src/external/bsd/tcpdump/dist/ascii_strcasecmp.c \
    src/external/bsd/tcpdump/dist/print-hncp.c \
    src/external/bsd/tcpdump/dist/print-lisp.c \
    src/external/bsd/tcpdump/dist/print-medsa.c \
    src/external/bsd/tcpdump/dist/print-nsh.c \
    src/external/bsd/tcpdump/dist/print-resp.c \
    src/external/bsd/tcpdump/dist/print-vxlan-gpe.c \
    src/external/bsd/tcpdump/dist/print.c \
    src/external/bsd/tcpdump/dist/strtoaddr.c \
    src/external/bsd/tcpdump/dist/util-print.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tcpdump/dist/af.c \
    src/external/bsd/tcpdump/dist/bpf_dump.c \
    src/external/bsd/tcpdump/dist/ether.h \
    src/external/bsd/tcpdump/dist/gmpls.c \
    src/external/bsd/tcpdump/dist/gmt2local.c \
    src/external/bsd/tcpdump/dist/ip6.h \
    src/external/bsd/tcpdump/dist/ipproto.c \
    src/external/bsd/tcpdump/dist/l2vpn.c \
    src/external/bsd/tcpdump/dist/nameser.h \
    src/external/bsd/tcpdump/dist/print-ah.c \
    src/external/bsd/tcpdump/dist/print-ap1394.c \
    src/external/bsd/tcpdump/dist/print-beep.c \
    src/external/bsd/tcpdump/dist/print-bfd.c \
    src/external/bsd/tcpdump/dist/print-bt.c \
    src/external/bsd/tcpdump/dist/print-cip.c \
    src/external/bsd/tcpdump/dist/print-dvmrp.c \
    src/external/bsd/tcpdump/dist/print-eap.c \
    src/external/bsd/tcpdump/dist/print-egp.c \
    src/external/bsd/tcpdump/dist/print-fddi.c \
    src/external/bsd/tcpdump/dist/print-forces.c \
    src/external/bsd/tcpdump/dist/print-frag6.c \
    src/external/bsd/tcpdump/dist/print-ip6opts.c \
    src/external/bsd/tcpdump/dist/print-ipcomp.c \
    src/external/bsd/tcpdump/dist/print-ipfc.c \
    src/external/bsd/tcpdump/dist/print-ipx.c \
    src/external/bsd/tcpdump/dist/print-lane.c \
    src/external/bsd/tcpdump/dist/print-mobile.c \
    src/external/bsd/tcpdump/dist/print-msdp.c \
    src/external/bsd/tcpdump/dist/print-pptp.c \
    src/external/bsd/tcpdump/dist/print-raw.c \
    src/external/bsd/tcpdump/dist/print-ripng.c \
    src/external/bsd/tcpdump/dist/print-rrcp.c \
    src/external/bsd/tcpdump/dist/print-rt6.c \
    src/external/bsd/tcpdump/dist/print-snmp.c \
    src/external/bsd/tcpdump/dist/print-sunatm.c \
    src/external/bsd/tcpdump/dist/print-symantec.c \
    src/external/bsd/tcpdump/dist/print-timed.c \
    src/external/bsd/tcpdump/dist/print-token.c \
    src/external/bsd/tcpdump/dist/print-vjc.c \
    src/external/bsd/tcpdump/dist/print-vqp.c \
    src/external/bsd/tcpdump/dist/print-vrrp.c \
    src/external/bsd/tcpdump/dist/smbutil.c \
    src/external/bsd/tcpdump/dist/vfprintf.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/tcpdump/dist/atmuni31.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/dist/checksum.c \
    src/external/bsd/tcpdump/dist/cpack.c \
    src/external/bsd/tcpdump/dist/cpack.h src/external/bsd/tcpdump/dist/ip.h \
    src/external/bsd/tcpdump/dist/nlpid.c src/external/bsd/tcpdump/dist/oui.c \
    src/external/bsd/tcpdump/dist/print-802_11.c \
    src/external/bsd/tcpdump/dist/print-aodv.c \
    src/external/bsd/tcpdump/dist/print-ascii.c \
    src/external/bsd/tcpdump/dist/print-atalk.c \
    src/external/bsd/tcpdump/dist/print-cnfp.c \
    src/external/bsd/tcpdump/dist/print-dccp.c \
    src/external/bsd/tcpdump/dist/print-dhcp6.c \
    src/external/bsd/tcpdump/dist/print-domain.c \
    src/external/bsd/tcpdump/dist/print-enc.c \
    src/external/bsd/tcpdump/dist/print-hsrp.c \
    src/external/bsd/tcpdump/dist/print-igmp.c \
    src/external/bsd/tcpdump/dist/print-igrp.c \
    src/external/bsd/tcpdump/dist/print-ip6.c \
    src/external/bsd/tcpdump/dist/print-krb.c \
    src/external/bsd/tcpdump/dist/print-l2tp.c \
    src/external/bsd/tcpdump/dist/print-lwapp.c \
    src/external/bsd/tcpdump/dist/print-lwres.c \
    src/external/bsd/tcpdump/dist/print-mobility.c \
    src/external/bsd/tcpdump/dist/print-mpcp.c \
    src/external/bsd/tcpdump/dist/print-mpls.c \
    src/external/bsd/tcpdump/dist/print-nfs.c \
    src/external/bsd/tcpdump/dist/print-ntp.c \
    src/external/bsd/tcpdump/dist/print-null.c \
    src/external/bsd/tcpdump/dist/print-ospf6.c \
    src/external/bsd/tcpdump/dist/print-pppoe.c \
    src/external/bsd/tcpdump/dist/print-rip.c \
    src/external/bsd/tcpdump/dist/print-rx.c \
    src/external/bsd/tcpdump/dist/print-sip.c \
    src/external/bsd/tcpdump/dist/print-sl.c \
    src/external/bsd/tcpdump/dist/print-smb.c \
    src/external/bsd/tcpdump/dist/print-stp.c \
    src/external/bsd/tcpdump/dist/print-sunrpc.c \
    src/external/bsd/tcpdump/dist/print-syslog.c \
    src/external/bsd/tcpdump/dist/print-telnet.c \
    src/external/bsd/tcpdump/dist/print-tftp.c \
    src/external/bsd/tcpdump/dist/print-wb.c \
    src/external/bsd/tcpdump/dist/print-zephyr.c \
    src/external/bsd/tcpdump/dist/setsignal.c \
    src/external/bsd/tcpdump/dist/signature.c \
    src/external/bsd/tcpdump/dist/util.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tcpdump/dist/configure \
    src/external/bsd/tcpdump/dist/configure.in \
    src/external/bsd/tcpdump/dist/interface.h \
    src/external/bsd/tcpdump/dist/machdep.c \
    src/external/bsd/tcpdump/dist/parsenfsfh.c \
    src/external/bsd/tcpdump/dist/print-arcnet.c \
    src/external/bsd/tcpdump/dist/print-arp.c \
    src/external/bsd/tcpdump/dist/print-atm.c \
    src/external/bsd/tcpdump/dist/print-bgp.c \
    src/external/bsd/tcpdump/dist/print-bootp.c \
    src/external/bsd/tcpdump/dist/print-cdp.c \
    src/external/bsd/tcpdump/dist/print-cfm.c \
    src/external/bsd/tcpdump/dist/print-chdlc.c \
    src/external/bsd/tcpdump/dist/print-decnet.c \
    src/external/bsd/tcpdump/dist/print-eigrp.c \
    src/external/bsd/tcpdump/dist/print-esp.c \
    src/external/bsd/tcpdump/dist/print-ether.c \
    src/external/bsd/tcpdump/dist/print-fr.c \
    src/external/bsd/tcpdump/dist/print-gre.c \
    src/external/bsd/tcpdump/dist/print-icmp.c \
    src/external/bsd/tcpdump/dist/print-isoclns.c \
    src/external/bsd/tcpdump/dist/print-juniper.c \
    src/external/bsd/tcpdump/dist/print-ldp.c \
    src/external/bsd/tcpdump/dist/print-llc.c \
    src/external/bsd/tcpdump/dist/print-lldp.c \
    src/external/bsd/tcpdump/dist/print-lspping.c \
    src/external/bsd/tcpdump/dist/print-ospf.c \
    src/external/bsd/tcpdump/dist/print-pflog.c \
    src/external/bsd/tcpdump/dist/print-pgm.c \
    src/external/bsd/tcpdump/dist/print-ppp.c \
    src/external/bsd/tcpdump/dist/print-radius.c \
    src/external/bsd/tcpdump/dist/print-sctp.c \
    src/external/bsd/tcpdump/dist/print-sflow.c \
    src/external/bsd/tcpdump/dist/print-sll.c \
    src/external/bsd/tcpdump/dist/print-slow.c \
    src/external/bsd/tcpdump/dist/print-tcp.c \
    src/external/bsd/tcpdump/dist/print-udp.c \
    src/external/bsd/tcpdump/dist/tcp.h src/external/bsd/tcpdump/dist/udp.h
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/tcpdump/dist/in_cksum.c \
    src/external/bsd/tcpdump/dist/print-802_15_4.c \
    src/external/bsd/tcpdump/dist/print-calm-fast.c \
    src/external/bsd/tcpdump/dist/print-mptcp.c \
    src/external/bsd/tcpdump/dist/print-msnlb.c \
    src/external/bsd/tcpdump/dist/print-otv.c \
    src/external/bsd/tcpdump/dist/print-tipc.c \
    src/external/bsd/tcpdump/dist/print-usb.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tcpdump/dist/netdissect.h \
    src/external/bsd/tcpdump/dist/print-ahcp.c \
    src/external/bsd/tcpdump/dist/print-pfsync.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tcpdump/dist/print-aoe.c \
    src/external/bsd/tcpdump/dist/print-loopback.c \
    src/external/bsd/tcpdump/dist/print-m3ua.c \
    src/external/bsd/tcpdump/dist/print-pktap.c \
    src/external/bsd/tcpdump/dist/print-rpki-rtr.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/tcpdump/dist/print-babel.c \
    src/external/bsd/tcpdump/dist/print-olsr.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/tcpdump/dist/print-carp.c \
    src/external/bsd/tcpdump/dist/print-dtp.c \
    src/external/bsd/tcpdump/dist/print-geonet.c \
    src/external/bsd/tcpdump/dist/print-nflog.c \
    src/external/bsd/tcpdump/dist/print-openflow-1.0.c \
    src/external/bsd/tcpdump/dist/print-openflow.c \
    src/external/bsd/tcpdump/dist/print-ppi.c \
    src/external/bsd/tcpdump/dist/print-udld.c \
    src/external/bsd/tcpdump/dist/print-vtp.c \
    src/external/bsd/tcpdump/dist/print-vxlan.c \
    src/external/bsd/tcpdump/dist/print-zeromq.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/tcpdump/dist/print-ftp.c \
    src/external/bsd/tcpdump/dist/print-geneve.c \
    src/external/bsd/tcpdump/dist/print-http.c \
    src/external/bsd/tcpdump/dist/print-rtsp.c \
    src/external/bsd/tcpdump/dist/print-smtp.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/dist/print-icmp6.c \
    src/external/bsd/tcpdump/dist/print-ip.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/tcpdump/dist/print-ipnet.c
cvs rdiff -u -r1.4 -r0 src/external/bsd/tcpdump/dist/strcasecmp.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/tcpdump/dist/tcpdump-stdinc.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tcpdump/dist/tcpdump.1.in
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tcpdump/dist/tcpdump.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/tcpdump/dist/missing/addrinfo.h \
    src/external/bsd/tcpdump/dist/missing/getnameinfo.c \
    src/external/bsd/tcpdump/dist/missing/inet_aton.c \
    src/external/bsd/tcpdump/dist/missing/inet_ntop.c \
    src/external/bsd/tcpdump/dist/missing/inet_pton.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/tcpdump/dist/win32/Include/w32_fzs.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Prev by Date: CVS commit: src/distrib/sets/lists/comp
Next by Date: CVS commit: src/doc
Previous by Thread: CVS commit: src/distrib/sets/lists/comp
Next by Thread: CVS commit: src/doc
Indexes:
Home | Main Index | Thread Index | Old Index