head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.6 perseant-exfatfs-base:1.2 netbsd-8-3-RELEASE:1.1.1.1 cjep_sun2x:1.2.0.4 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.2 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 netbsd-8-2-RELEASE:1.1.1.1 netbsd-8-1-RELEASE:1.1.1.1 netbsd-8-1-RC1:1.1.1.1 pgoyette-compat-merge-20190127:1.1.1.1.12.1 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.1.1.1 netbsd-8-0-RELEASE:1.1.1.1 phil-wifi:1.1.1.1.0.14 phil-wifi-base:1.1.1.1 pgoyette-compat-0625:1.1.1.1 netbsd-8-0-RC2:1.1.1.1 pgoyette-compat-0521:1.1.1.1 pgoyette-compat-0502:1.1.1.1 pgoyette-compat-0422:1.1.1.1 netbsd-8-0-RC1:1.1.1.1 pgoyette-compat-0415:1.1.1.1 pgoyette-compat-0407:1.1.1.1 pgoyette-compat-0330:1.1.1.1 pgoyette-compat-0322:1.1.1.1 pgoyette-compat-0315:1.1.1.1 pgoyette-compat:1.1.1.1.0.12 pgoyette-compat-base:1.1.1.1 matt-nb8-mediatek:1.1.1.1.0.10 matt-nb8-mediatek-base:1.1.1.1 perseant-stdc-iso10646:1.1.1.1.0.8 perseant-stdc-iso10646-base:1.1.1.1 netbsd-8:1.1.1.1.0.6 netbsd-8-base:1.1.1.1 prg-localcount2-base3:1.1.1.1 prg-localcount2-base2:1.1.1.1 prg-localcount2-base1:1.1.1.1 prg-localcount2:1.1.1.1.0.4 prg-localcount2-base:1.1.1.1 pgoyette-localcount-20170426:1.1.1.1 bouyer-socketcan-base1:1.1.1.1 pgoyette-localcount:1.1.1.1.0.2 pgoyette-localcount-20170320:1.1.1.1 libpcap-1_8_1:1.1.1.1 TCPDUMP:1.1.1; locks; strict; comment @# @; 1.2 date 2018.09.03.15.26.44; author christos; state dead; branches; next 1.1; commitid 9JwqCIM5Y2ASHFQA; 1.1 date 2017.01.24.21.55.30; author christos; state Exp; branches 1.1.1.1; next ; commitid i5OQRQb5tdyeJgDz; 1.1.1.1 date 2017.01.24.21.55.30; author christos; state Exp; branches 1.1.1.1.2.1 1.1.1.1.12.1 1.1.1.1.14.1; next ; commitid i5OQRQb5tdyeJgDz; 1.1.1.1.2.1 date 2017.01.24.21.55.30; author pgoyette; state dead; branches; next 1.1.1.1.2.2; commitid jjw7cAwgyKq7RfKz; 1.1.1.1.2.2 date 2017.03.20.06.52.25; author pgoyette; state Exp; branches; next ; commitid jjw7cAwgyKq7RfKz; 1.1.1.1.12.1 date 2018.09.06.06.51.46; author pgoyette; state dead; branches; next ; commitid HCi1bXD317XIK0RA; 1.1.1.1.14.1 date 2019.06.10.21.45.01; author christos; state dead; branches; next ; commitid jtc8rnCzWiEEHGqB; desc @@ 1.2 log @merge conflicts @ text @if( NOT LIBPCAP_PRECONFIGURED ) set( LIBPCAP_PRECONFIGURED TRUE ) ################################################################### # Parameters ################################################################### option (USE_STATIC_RT "Use static Runtime" ON) ###################################### # Project setings ###################################### add_definitions( -DBUILDING_PCAP ) if( MSVC ) add_definitions( -D__STDC__ ) add_definitions( -D_CRT_SECURE_NO_WARNINGS ) add_definitions( "-D_U_=" ) elseif( CMAKE_COMPILER_IS_GNUCXX ) add_definitions( "-D_U_=__attribute__((unused))" ) else(MSVC) add_definitions( "-D_U_=" ) endif( MSVC ) if (USE_STATIC_RT) MESSAGE( STATUS "Use STATIC runtime" ) if( MSVC ) set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT") set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT") set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT") set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd") endif( MSVC ) else (USE_STATIC_RT) MESSAGE( STATUS "Use DYNAMIC runtime" ) if( MSVC ) set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD") set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MD") set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MD") set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd") endif( MSVC ) endif (USE_STATIC_RT) endif( NOT LIBPCAP_PRECONFIGURED ) @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Tuesday, Oct. 25, 2016 mcr@@sandelman.ca Summary for 1.8.1 libpcap release Add a target in Makefile.in for Exuberant Ctags use: 'extags'. Rename configure.in to configure.ac: autoconf 2.59 Clean up the name-to-DLT mapping table. Add some newer DLT_ values: IPMI_HPM_2,ZWAVE_R1_R2,ZWAVE_R3,WATTSTOPPER_DLM,ISO_14443,RDS Clarify what the return values are for both success and failure. Many changes to build on windows Check for the "break the loop" condition in the inner loop for TPACKET_V3. Fix handling of packet count in the TPACKET_V3 inner loop: GitHub issue #493. Filter out duplicate looped back CAN frames. Fix the handling of loopback filters for IPv6 packets. Add a link-layer header type for RDS (IEC 62106) groups. Use different intermediate folders for x86 and x64 builds on Windows. On Linux, handle all CAN captures with pcap-linux.c, in cooked mode. Removes the need for the "host-endian" link-layer header type. Compile with '-Wused-but-marked-unused' in devel mode if supported Have separate DLTs for big-endian and host-endian SocketCAN headers. Reflect version.h being renamed to pcap_version.h. Require that version.h be generated: all build procedures we support generate version.h (autoconf, CMake, MSVC)! Properly check for sock_recv() errors. Re-impose some of Winsock's limitations on sock_recv(). Replace sprintf() with pcap_snprintf(). Fix signature of pcap_stats_ex_remote(). Initial cmake support for remote packet capture. Have rpcap_remoteact_getsock() return a SOCKET and supply an "is active" flag. Clean up {DAG, Septel, Myricom SNF}-only builds. Do UTF-16-to-ASCII conversion into the right place. pcap_create_interface() needs the interface name on Linux. Clean up hardware time stamp support: the "any" device does not support any time stamp types. Add support for capturing on FreeBSD usbusN interfaces. Add a LINKTYPE/DLT_ value for FreeBSD USB. Go back to using PCAP_API on Windows. CMake support Add TurboCap support from WinPcap. Recognize 802.1ad nested VLAN tag in vlan filter. Thursday Sep. 3, 2015 guy@@alum.mit.edu Summary for 1.7.5 libpcap release Man page cleanups. Add some allocation failure checks. Fix a number of Linux/ucLinux configure/build issues. Fix some memory leaks. Recognize 802.1ad nested VLAN tag in vlan filter. Fix building Bluetooth Linux Monitor support with BlueZ 5.1+ Saturday Jun. 27, 2015 mcr@@sandelman.ca Summary for 1.7.4 libpcap release Include fix for GitHub issue #424 -- out of tree builds. Friday Apr. 10, 2015 guy@@alum.mit.edu Summary for 1.7.3 libpcap release Work around a Linux bonding driver bug. @ text @@ 1.1.1.1.14.1 log @Sync with HEAD @ text @@ 1.1.1.1.12.1 log @Sync with HEAD Resolve a couple of conflicts (result of the uimin/uimax changes) @ text @@ 1.1.1.1.2.1 log @file preconfigure.cmake was added on branch pgoyette-localcount on 2017-03-20 06:52:25 +0000 @ text @d1 55 @ 1.1.1.1.2.2 log @Sync with HEAD @ text @a0 55 if( NOT LIBPCAP_PRECONFIGURED ) set( LIBPCAP_PRECONFIGURED TRUE ) ################################################################### # Parameters ################################################################### option (USE_STATIC_RT "Use static Runtime" ON) ###################################### # Project setings ###################################### add_definitions( -DBUILDING_PCAP ) if( MSVC ) add_definitions( -D__STDC__ ) add_definitions( -D_CRT_SECURE_NO_WARNINGS ) add_definitions( "-D_U_=" ) elseif( CMAKE_COMPILER_IS_GNUCXX ) add_definitions( "-D_U_=__attribute__((unused))" ) else(MSVC) add_definitions( "-D_U_=" ) endif( MSVC ) if (USE_STATIC_RT) MESSAGE( STATUS "Use STATIC runtime" ) if( MSVC ) set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT") set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT") set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT") set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd") endif( MSVC ) else (USE_STATIC_RT) MESSAGE( STATUS "Use DYNAMIC runtime" ) if( MSVC ) set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD") set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MD") set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MD") set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd") endif( MSVC ) endif (USE_STATIC_RT) endif( NOT LIBPCAP_PRECONFIGURED ) @