Module Name: src
Committed By: christos
Date: Tue Jan 24 22:29:29 UTC 2017
Modified Files:
src/external/bsd/libpcap/dist: bpf_dump.c bpf_image.c dlpisubs.c
etherent.c ethertype.h fad-getad.c fad-gifc.c fad-glifc.c gencode.c
gencode.h grammar.y inet.c nametoaddr.c optimize.c pcap-bpf.c
pcap-bt-linux.c pcap-bt-monitor-linux.c pcap-common.c pcap-config.1
pcap-dag.c pcap-dag.h pcap-dbus.c pcap-dlpi.c pcap-dos.c pcap-int.h
pcap-libdlpi.c pcap-linux.c pcap-netfilter-linux.c pcap-nit.c
pcap-null.c pcap-pf.c pcap-septel.c pcap-sita.c pcap-snf.c
pcap-snit.c pcap-snoop.c pcap-stdinc.h pcap-usb-linux.c
pcap-win32.c pcap.3pcap.in pcap.c pcap_activate.3pcap
pcap_breakloop.3pcap pcap_can_set_rfmon.3pcap pcap_close.3pcap
pcap_create.3pcap pcap_datalink_name_to_val.3pcap
pcap_datalink_val_to_name.3pcap pcap_dump.3pcap
pcap_dump_close.3pcap pcap_dump_file.3pcap pcap_dump_flush.3pcap
pcap_dump_ftell.3pcap pcap_dump_open.3pcap.in pcap_file.3pcap
pcap_fileno.3pcap pcap_findalldevs.3pcap pcap_freecode.3pcap
pcap_get_selectable_fd.3pcap pcap_geterr.3pcap pcap_inject.3pcap
pcap_is_swapped.3pcap pcap_lib_version.3pcap pcap_lookupdev.3pcap
pcap_lookupnet.3pcap pcap_loop.3pcap pcap_major_version.3pcap
pcap_next_ex.3pcap pcap_offline_filter.3pcap pcap_open_live.3pcap
pcap_open_offline.3pcap.in pcap_set_buffer_size.3pcap
pcap_set_datalink.3pcap pcap_set_immediate_mode.3pcap
pcap_set_promisc.3pcap pcap_set_rfmon.3pcap pcap_set_snaplen.3pcap
pcap_set_timeout.3pcap pcap_setdirection.3pcap pcap_setfilter.3pcap
pcap_setnonblock.3pcap pcap_snapshot.3pcap pcap_stats.3pcap
pcap_statustostr.3pcap pcap_strerror.3pcap
pcap_tstamp_type_name_to_val.3pcap
pcap_tstamp_type_val_to_name.3pcap savefile.c scanner.l
sf-pcap-ng.c sf-pcap.c
src/external/bsd/libpcap/dist/bpf/net: bpf_filter.c
src/external/bsd/libpcap/dist/lbl: os-osf4.h os-osf5.h os-solaris2.h
os-sunos4.h os-ultrix4.h
src/external/bsd/libpcap/dist/pcap: bluetooth.h bpf.h namedb.h nflog.h
pcap.h sll.h usb.h
src/external/bsd/libpcap/dist/tests: capturetest.c filtertest.c
findalldevstest.c opentest.c reactivatetest.c selpolltest.c
valgrindtest.c
src/external/bsd/libpcap/include: config.h
src/external/bsd/libpcap/lib: Makefile shlib_version
Added Files:
src/external/bsd/libpcap/lib: pcap_version.c pcap_version.h
Removed Files:
src/external/bsd/libpcap/dist: configure.in fad-null.c fad-sita.c
fad-win32.c pcap-can-linux.c pcap-can-linux.h pcap-canusb-linux.c
pcap-canusb-linux.h runlex.sh scanner.c.top
src/external/bsd/libpcap/dist/Win32/Include: addrinfo.h bittypes.h
cdecl_ext.h inetprivate.h ip6_misc.h sockstorage.h
src/external/bsd/libpcap/dist/Win32/Include/arpa: nameser.h
src/external/bsd/libpcap/dist/Win32/Include/net: netdb.h paths.h
src/external/bsd/libpcap/dist/Win32/Prj: libpcap.dsp libpcap.dsw
src/external/bsd/libpcap/dist/Win32/Src: ffs.c gai_strerror.c
getaddrinfo.c getnetbynm.c getnetent.c getopt.c getservent.c
inet_aton.c inet_net.c inet_pton.c
src/external/bsd/libpcap/lib: version.c version.h
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/bpf_dump.c \
src/external/bsd/libpcap/dist/bpf_image.c \
src/external/bsd/libpcap/dist/dlpisubs.c \
src/external/bsd/libpcap/dist/etherent.c \
src/external/bsd/libpcap/dist/ethertype.h \
src/external/bsd/libpcap/dist/fad-getad.c \
src/external/bsd/libpcap/dist/fad-glifc.c \
src/external/bsd/libpcap/dist/nametoaddr.c \
src/external/bsd/libpcap/dist/pcap-dag.h \
src/external/bsd/libpcap/dist/pcap-libdlpi.c \
src/external/bsd/libpcap/dist/pcap-null.c \
src/external/bsd/libpcap/dist/pcap-stdinc.h \
src/external/bsd/libpcap/dist/pcap_activate.3pcap \
src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap \
src/external/bsd/libpcap/dist/pcap_close.3pcap \
src/external/bsd/libpcap/dist/pcap_create.3pcap \
src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_close.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_file.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap \
src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap \
src/external/bsd/libpcap/dist/pcap_file.3pcap \
src/external/bsd/libpcap/dist/pcap_fileno.3pcap \
src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap \
src/external/bsd/libpcap/dist/pcap_freecode.3pcap \
src/external/bsd/libpcap/dist/pcap_geterr.3pcap \
src/external/bsd/libpcap/dist/pcap_inject.3pcap \
src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap \
src/external/bsd/libpcap/dist/pcap_lib_version.3pcap \
src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap \
src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap \
src/external/bsd/libpcap/dist/pcap_major_version.3pcap \
src/external/bsd/libpcap/dist/pcap_next_ex.3pcap \
src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap \
src/external/bsd/libpcap/dist/pcap_open_live.3pcap \
src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap \
src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap \
src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap \
src/external/bsd/libpcap/dist/pcap_set_promisc.3pcap \
src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap \
src/external/bsd/libpcap/dist/pcap_set_snaplen.3pcap \
src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap \
src/external/bsd/libpcap/dist/pcap_setfilter.3pcap \
src/external/bsd/libpcap/dist/pcap_snapshot.3pcap \
src/external/bsd/libpcap/dist/pcap_stats.3pcap \
src/external/bsd/libpcap/dist/pcap_statustostr.3pcap \
src/external/bsd/libpcap/dist/pcap_strerror.3pcap \
src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap
cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/libpcap/dist/configure.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/fad-gifc.c \
src/external/bsd/libpcap/dist/gencode.h \
src/external/bsd/libpcap/dist/inet.c \
src/external/bsd/libpcap/dist/pcap-bt-linux.c \
src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c \
src/external/bsd/libpcap/dist/pcap-dag.c \
src/external/bsd/libpcap/dist/pcap-dbus.c \
src/external/bsd/libpcap/dist/pcap-dlpi.c \
src/external/bsd/libpcap/dist/pcap-dos.c \
src/external/bsd/libpcap/dist/pcap-int.h \
src/external/bsd/libpcap/dist/pcap-linux.c \
src/external/bsd/libpcap/dist/pcap-netfilter-linux.c \
src/external/bsd/libpcap/dist/pcap-nit.c \
src/external/bsd/libpcap/dist/pcap-pf.c \
src/external/bsd/libpcap/dist/pcap-septel.c \
src/external/bsd/libpcap/dist/pcap-sita.c \
src/external/bsd/libpcap/dist/pcap-snf.c \
src/external/bsd/libpcap/dist/pcap-snit.c \
src/external/bsd/libpcap/dist/pcap-snoop.c \
src/external/bsd/libpcap/dist/pcap-usb-linux.c \
src/external/bsd/libpcap/dist/pcap-win32.c \
src/external/bsd/libpcap/dist/pcap_breakloop.3pcap \
src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap \
src/external/bsd/libpcap/dist/pcap_dump.3pcap \
src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap \
src/external/bsd/libpcap/dist/pcap_loop.3pcap \
src/external/bsd/libpcap/dist/pcap_setdirection.3pcap \
src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap \
src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap \
src/external/bsd/libpcap/dist/savefile.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/libpcap/dist/fad-null.c \
src/external/bsd/libpcap/dist/fad-sita.c \
src/external/bsd/libpcap/dist/pcap-can-linux.h \
src/external/bsd/libpcap/dist/pcap-canusb-linux.h
cvs rdiff -u -r1.3 -r0 src/external/bsd/libpcap/dist/fad-win32.c \
src/external/bsd/libpcap/dist/pcap-can-linux.c \
src/external/bsd/libpcap/dist/pcap-canusb-linux.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libpcap/dist/gencode.c \
src/external/bsd/libpcap/dist/optimize.c \
src/external/bsd/libpcap/dist/scanner.l
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/grammar.y \
src/external/bsd/libpcap/dist/pcap-bpf.c \
src/external/bsd/libpcap/dist/pcap.3pcap.in \
src/external/bsd/libpcap/dist/pcap.c \
src/external/bsd/libpcap/dist/sf-pcap-ng.c \
src/external/bsd/libpcap/dist/sf-pcap.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/pcap-common.c \
src/external/bsd/libpcap/dist/pcap-config.1
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in \
src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/libpcap/dist/runlex.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/scanner.c.top
cvs rdiff -u -r1.1.1.5 -r0 \
src/external/bsd/libpcap/dist/Win32/Include/addrinfo.h
cvs rdiff -u -r1.1.1.4 -r0 \
src/external/bsd/libpcap/dist/Win32/Include/bittypes.h \
src/external/bsd/libpcap/dist/Win32/Include/cdecl_ext.h \
src/external/bsd/libpcap/dist/Win32/Include/ip6_misc.h \
src/external/bsd/libpcap/dist/Win32/Include/sockstorage.h
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/libpcap/dist/Win32/Include/inetprivate.h
cvs rdiff -u -r1.1.1.4 -r0 \
src/external/bsd/libpcap/dist/Win32/Include/arpa/nameser.h
cvs rdiff -u -r1.1.1.4 -r0 \
src/external/bsd/libpcap/dist/Win32/Include/net/netdb.h
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/libpcap/dist/Win32/Include/net/paths.h
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/libpcap/dist/Win32/Prj/libpcap.dsp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libpcap/dist/Win32/Prj/libpcap.dsw
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/libpcap/dist/Win32/Src/ffs.c \
src/external/bsd/libpcap/dist/Win32/Src/getnetbynm.c \
src/external/bsd/libpcap/dist/Win32/Src/getopt.c \
src/external/bsd/libpcap/dist/Win32/Src/getservent.c \
src/external/bsd/libpcap/dist/Win32/Src/inet_net.c
cvs rdiff -u -r1.1.1.4 -r0 \
src/external/bsd/libpcap/dist/Win32/Src/gai_strerror.c \
src/external/bsd/libpcap/dist/Win32/Src/getnetent.c
cvs rdiff -u -r1.1.1.5 -r0 \
src/external/bsd/libpcap/dist/Win32/Src/getaddrinfo.c \
src/external/bsd/libpcap/dist/Win32/Src/inet_aton.c \
src/external/bsd/libpcap/dist/Win32/Src/inet_pton.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/lbl/os-osf4.h \
src/external/bsd/libpcap/dist/lbl/os-osf5.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/lbl/os-solaris2.h \
src/external/bsd/libpcap/dist/lbl/os-sunos4.h \
src/external/bsd/libpcap/dist/lbl/os-ultrix4.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/pcap/bluetooth.h \
src/external/bsd/libpcap/dist/pcap/usb.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/pcap/bpf.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/pcap/namedb.h \
src/external/bsd/libpcap/dist/pcap/nflog.h \
src/external/bsd/libpcap/dist/pcap/sll.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libpcap/dist/pcap/pcap.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/tests/capturetest.c \
src/external/bsd/libpcap/dist/tests/opentest.c \
src/external/bsd/libpcap/dist/tests/reactivatetest.c \
src/external/bsd/libpcap/dist/tests/selpolltest.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/tests/filtertest.c \
src/external/bsd/libpcap/dist/tests/findalldevstest.c \
src/external/bsd/libpcap/dist/tests/valgrindtest.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/include/config.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/libpcap/lib/pcap_version.c \
src/external/bsd/libpcap/lib/pcap_version.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/lib/shlib_version
cvs rdiff -u -r1.3 -r0 src/external/bsd/libpcap/lib/version.c \
src/external/bsd/libpcap/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
