Module Name: src Committed By: christos Date: Thu Aug 17 15:18:13 UTC 2023
Modified Files: src/external/bsd/libpcap: Makefile.inc src/external/bsd/libpcap/dist: atmuni31.h bpf_filter.c bpf_image.c config.guess config.sub dlpisubs.c etherent.c ethertype.h fad-getad.c fad-gifc.c fad-glifc.c gencode.c gencode.h nametoaddr.c optimize.c pcap-bpf.c pcap-bt-linux.c pcap-bt-monitor-linux.c pcap-common.c pcap-common.h pcap-config.1 pcap-config.in pcap-dag.c pcap-dbus.c pcap-dlpi.c pcap-dos.c pcap-enet.c pcap-int.h pcap-libdlpi.c pcap-linux.c pcap-netfilter-linux.c pcap-nit.c pcap-pf.c pcap-rpcap-unix.c pcap-rpcap.c pcap-septel.c pcap-sita.c pcap-snf.c pcap-snit.c pcap-snoop.c pcap-usb-linux-common.c pcap-usb-linux.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_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.c sockutils.c sslutils.c src/external/bsd/libpcap/dist/lbl: os-osf4.h os-osf5.h os-solaris2.h os-sunos4.h src/external/bsd/libpcap/dist/pcap: bpf.h namedb.h pcap.h src/external/bsd/libpcap/include: config.h src/external/bsd/libpcap/lib: Makefile shlib_version src/external/bsd/libpcap/sbin/rpcapd: Makefile Removed Files: src/external/bsd/libpcap/dist: grammar.y src/external/bsd/libpcap/dist/Win32/Prj: wpcap.sln wpcap.vcxproj wpcap.vcxproj.filters src/external/bsd/libpcap/dist/doc: DLT_ALLOCATE_HOWTO.md README.linux.md README.tru64 src/external/bsd/libpcap/dist/missing: snprintf.c win_snprintf.c Log Message: merge conflicts between libpcap 1.9.1 and 1.10.4 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/atmuni31.h \ src/external/bsd/libpcap/dist/pcap-rpcap-unix.c \ src/external/bsd/libpcap/dist/pcap-rpcap.c \ src/external/bsd/libpcap/dist/sockutils.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/bpf_filter.c \ src/external/bsd/libpcap/dist/config.guess \ src/external/bsd/libpcap/dist/dlpisubs.c \ src/external/bsd/libpcap/dist/etherent.c \ src/external/bsd/libpcap/dist/fad-getad.c \ src/external/bsd/libpcap/dist/fad-glifc.c \ src/external/bsd/libpcap/dist/pcap-config.in \ src/external/bsd/libpcap/dist/pcap_create.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_file.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_lookupnet.3pcap \ src/external/bsd/libpcap/dist/pcap_major_version.3pcap \ src/external/bsd/libpcap/dist/pcap_offline_filter.3pcap \ src/external/bsd/libpcap/dist/pcap_set_datalink.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_strerror.3pcap \ src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/bpf_image.c \ src/external/bsd/libpcap/dist/fad-gifc.c \ src/external/bsd/libpcap/dist/nametoaddr.c \ src/external/bsd/libpcap/dist/pcap-config.1 \ src/external/bsd/libpcap/dist/pcap-dbus.c \ src/external/bsd/libpcap/dist/pcap-libdlpi.c \ src/external/bsd/libpcap/dist/pcap-nit.c \ src/external/bsd/libpcap/dist/pcap-pf.c \ src/external/bsd/libpcap/dist/pcap-snit.c \ src/external/bsd/libpcap/dist/pcap-snoop.c \ src/external/bsd/libpcap/dist/pcap_activate.3pcap \ src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap \ src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap \ src/external/bsd/libpcap/dist/pcap_dump.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap \ src/external/bsd/libpcap/dist/pcap_fileno.3pcap \ src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap \ src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap \ src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap \ src/external/bsd/libpcap/dist/pcap_next_ex.3pcap \ src/external/bsd/libpcap/dist/pcap_open_live.3pcap \ src/external/bsd/libpcap/dist/pcap_set_timeout.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 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/config.sub \ src/external/bsd/libpcap/dist/ethertype.h \ src/external/bsd/libpcap/dist/pcap-common.h \ src/external/bsd/libpcap/dist/pcap-enet.c \ src/external/bsd/libpcap/dist/pcap_close.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_close.3pcap \ src/external/bsd/libpcap/dist/pcap_lib_version.3pcap \ src/external/bsd/libpcap/dist/pcap_set_buffer_size.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_statustostr.3pcap cvs rdiff -u -r1.12 -r1.13 src/external/bsd/libpcap/dist/gencode.c \ src/external/bsd/libpcap/dist/scanner.l cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/gencode.h \ src/external/bsd/libpcap/dist/pcap-common.c \ src/external/bsd/libpcap/dist/pcap-int.h cvs rdiff -u -r1.9 -r0 src/external/bsd/libpcap/dist/grammar.y cvs rdiff -u -r1.11 -r1.12 src/external/bsd/libpcap/dist/optimize.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libpcap/dist/pcap-bpf.c \ src/external/bsd/libpcap/dist/pcap.c cvs rdiff -u -r1.6 -r1.7 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-dlpi.c \ src/external/bsd/libpcap/dist/pcap-dos.c \ src/external/bsd/libpcap/dist/pcap-linux.c \ src/external/bsd/libpcap/dist/pcap-netfilter-linux.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-usb-linux.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_get_selectable_fd.3pcap \ src/external/bsd/libpcap/dist/pcap_loop.3pcap \ src/external/bsd/libpcap/dist/savefile.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/libpcap/dist/pcap-usb-linux-common.c \ src/external/bsd/libpcap/dist/sslutils.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libpcap/dist/pcap.3pcap.in \ src/external/bsd/libpcap/dist/sf-pcap.c cvs rdiff -u -r1.8 -r1.9 \ 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.1 -r0 src/external/bsd/libpcap/dist/Win32/Prj/wpcap.sln cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/libpcap/dist/Win32/Prj/wpcap.vcxproj \ src/external/bsd/libpcap/dist/Win32/Prj/wpcap.vcxproj.filters cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libpcap/dist/doc/DLT_ALLOCATE_HOWTO.md \ src/external/bsd/libpcap/dist/doc/README.tru64 cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libpcap/dist/doc/README.linux.md cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/lbl/os-osf4.h \ src/external/bsd/libpcap/dist/lbl/os-osf5.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/lbl/os-solaris2.h \ src/external/bsd/libpcap/dist/lbl/os-sunos4.h cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/libpcap/dist/missing/snprintf.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/libpcap/dist/missing/win_snprintf.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libpcap/dist/pcap/bpf.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/pcap/namedb.h cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libpcap/dist/pcap/pcap.h cvs rdiff -u -r1.11 -r1.12 src/external/bsd/libpcap/include/config.h cvs rdiff -u -r1.31 -r1.32 src/external/bsd/libpcap/lib/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/lib/shlib_version cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/sbin/rpcapd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
diffs are larger than 1MB and have been omitted