Merge branch 'dev' into fix-malformed-pkt-crash

Author: bratbiswas

CMakeLists.txt

@@ -1,7 +1,7 @@
 # We need 3.12 or later, so that we can set policy CMP0074; see below.
 cmake_minimum_required(VERSION 3.12)
 
-set(PCAPPP_VERSION "25.05")
+set(PCAPPP_VERSION "25.05+")
 
 # MAIN_PROJECT CHECK
 set(PCAPPP_MAIN_PROJECT OFF)
@@ -146,9 +146,9 @@ option(PCAPPP_USE_XDP "Setup PcapPlusPlus with XDP")
 option(PCAPPP_INSTALL "Install Pcap++" ${PCAPPP_MAIN_PROJECT})
 option(PCAPPP_PACKAGE "Package Pcap++ could require a recent version of CMake" OFF)
 
-# Set C++11 if not defined
+# Set C++14 if not defined
 if(NOT DEFINED CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD 14)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 

Common++/CMakeLists.txt

@@ -34,7 +34,7 @@ set(
 # Set the public header that will be installed
 set_property(TARGET Common++ PROPERTY PUBLIC_HEADER ${public_headers})
 
-target_compile_features(Common++ PUBLIC cxx_std_11)
+target_compile_features(Common++ PUBLIC cxx_std_14)
 
 target_include_directories(
   Common++

Common++/header/PcapPlusPlusVersion.h

@@ -8,8 +8,8 @@
 /// @brief The main namespace for the PcapPlusPlus lib
 namespace pcpp
 {
-#define PCAPPLUSPLUS_VERSION "25.05"
-#define PCAPPLUSPLUS_VERSION_OFFICIAL "official release"
+#define PCAPPLUSPLUS_VERSION "25.05+"
+#define PCAPPLUSPLUS_VERSION_OFFICIAL "non-official release"
 
 #define PCAPPLUSPLUS_VERSION_FULL "v" PCAPPLUSPLUS_VERSION " (" PCAPPLUSPLUS_VERSION_OFFICIAL ")"
 

Examples/CMakeLists.txt

@@ -4,8 +4,8 @@ project(PcapPlusPlusExamples)
 
 set(CMAKE_PROJECT_HOMEPAGE_URL "https://pcapplusplus.github.io/")
 
-# Set C++11
-set(CMAKE_CXX_STANDARD 11)
+# Set C++14
+set(CMAKE_CXX_STANDARD 14)
 # popen()/pclose() are not C++ standards
 set(CMAKE_CXX_EXTENSIONS ON)
 

Packet++/CMakeLists.txt

@@ -145,7 +145,7 @@ set(
 # Don't use set_target_properties CMake limit to 50 elements
 set_property(TARGET Packet++ PROPERTY PUBLIC_HEADER ${public_headers})
 
-target_compile_features(Packet++ PUBLIC cxx_std_11)
+target_compile_features(Packet++ PUBLIC cxx_std_14)
 
 target_include_directories(
   Packet++

Pcap++/CMakeLists.txt

@@ -64,7 +64,7 @@ endif()
 
 set_property(TARGET Pcap++ PROPERTY PUBLIC_HEADER ${public_headers})
 
-target_compile_features(Pcap++ PUBLIC cxx_std_11)
+target_compile_features(Pcap++ PUBLIC cxx_std_14)
 
 if(APPLE)
   target_link_libraries(Pcap++ PRIVATE "-framework CoreFoundation" "-framework SystemConfiguration")

Pcap++/header/PcapDevice.h

@@ -97,19 +97,12 @@ namespace pcpp
 		};
 	}  // namespace internal
 
-	/// @class IPcapDevice
-	/// An abstract class representing all libpcap-based packet capturing devices: files, libPcap, WinPcap/Npcap and
-	/// RemoteCapture. This class is abstract and cannot be instantiated
-	class IPcapDevice : public IDevice, public IFilterableDevice
+	/// @brief An interface for providing Pcap-based device statistics
+	class IPcapStatisticsProvider
 	{
-	protected:
-		internal::PcapHandle m_PcapDescriptor;
-
-		// c'tor should not be public
-		IPcapDevice() : IDevice()
-		{}
-
 	public:
+		virtual ~IPcapStatisticsProvider() = default;
+
 		/// @struct PcapStats
 		/// A container for pcap device statistics
 		struct PcapStats
@@ -122,11 +115,29 @@ namespace pcpp
 			uint64_t packetsDropByInterface;
 		};
 
-		virtual ~IPcapDevice();
+		/// @brief Get statistics from the device
+		/// @return An object containing the stats
+		PcapStats getStatistics() const;
 
 		/// Get statistics from the device
 		/// @param[out] stats An object containing the stats
 		virtual void getStatistics(PcapStats& stats) const = 0;
+	};
+
+	/// @class IPcapDevice
+	/// An abstract class representing all libpcap-based packet capturing devices: files, libPcap, WinPcap/Npcap and
+	/// RemoteCapture. This class is abstract and cannot be instantiated
+	class IPcapDevice : public IDevice, public IFilterableDevice, public IPcapStatisticsProvider
+	{
+	protected:
+		internal::PcapHandle m_PcapDescriptor;
+
+		// c'tor should not be public
+		IPcapDevice() : IDevice()
+		{}
+
+	public:
+		virtual ~IPcapDevice() = default;
 
 		/// A static method for retrieving pcap lib (libpcap/WinPcap/etc.) version information. This method is actually
 		/// a wrapper for [pcap_lib_version()](https://www.tcpdump.org/manpages/pcap_lib_version.3pcap.html)

Pcap++/header/PcapRemoteDeviceList.h

@@ -140,21 +140,45 @@ namespace pcpp
 		/// Search a PcapRemoteDevice in the list by its IPv4 address
 		/// @param[in] ip4Addr The IPv4 address
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const IPv4Address& ip4Addr) const;
 
+		/// Search a PcapRemoteDevice in the list by its IPv4 address
+		/// @param[in] ip4Addr The IPv4 address
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const IPv4Address& ip4Addr) const;
+
 		/// Search a PcapRemoteDevice in the list by its IPv6 address
 		/// @param[in] ip6Addr The IPv6 address
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const IPv6Address& ip6Addr) const;
 
+		/// Search a PcapRemoteDevice in the list by its IPv6 address
+		/// @param[in] ip6Addr The IPv6 address
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const IPv6Address& ip6Addr) const;
+
 		/// Search a PcapRemoteDevice in the list by its IP address (IPv4 or IPv6)
 		/// @param[in] ipAddr The IP address
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const IPAddress& ipAddr) const;
 
+		/// Search a PcapRemoteDevice in the list by its IP address (IPv4 or IPv6)
+		/// @param[in] ipAddr The IP address
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const IPAddress& ipAddr) const;
+
 		/// Search a PcapRemoteDevice in the list by its IP address
 		/// @param[in] ipAddrAsString The IP address in string format
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const std::string& ipAddrAsString) const;
+
+		/// Search a PcapRemoteDevice in the list by its IP address
+		/// @param[in] ipAddrAsString The IP address in string format
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const std::string& ipAddrAsString) const;
 	};
 }  // namespace pcpp

Pcap++/header/PfRingDeviceList.h

@@ -48,8 +48,14 @@ namespace pcpp
 		/// Get a PF_RING device by name. The name is the Linux interface name which appears in ifconfig
 		/// (e.g eth0, eth1, etc.)
 		/// @return A pointer to the PF_RING device
+		PCPP_DEPRECATED("Use `getDeviceByName`")
 		PfRingDevice* getPfRingDeviceByName(const std::string& devName) const;
 
+		/// Get a PF_RING device by name. The name is the Linux interface name which appears in ifconfig
+		/// (e.g eth0, eth1, etc.)
+		/// @return A pointer to the PF_RING device
+		PfRingDevice* getDeviceByName(const std::string& devName) const;
+
 		/// Get installed PF_RING version
 		/// @return A string representing PF_RING version
 		std::string getPfRingVersion() const

Pcap++/src/PcapDevice.cpp

@@ -105,8 +105,12 @@ namespace pcpp
 		}
 	}  // namespace internal
 
-	IPcapDevice::~IPcapDevice()
-	{}
+	IPcapStatisticsProvider::PcapStats IPcapStatisticsProvider::getStatistics() const
+	{
+		PcapStats stats;
+		getStatistics(stats);
+		return stats;
+	}
 
 	bool IPcapDevice::setFilter(std::string filterAsString)
 	{

Pcap++/src/PcapRemoteDeviceList.cpp

@@ -122,6 +122,11 @@ namespace pcpp
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const std::string& ipAddrAsString) const
+	{
+		return getDeviceByIP(ipAddrAsString);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const std::string& ipAddrAsString) const
 	{
 		IPAddress ipAddr;
 
@@ -135,23 +140,33 @@ namespace pcpp
 			return nullptr;
 		}
 
-		PcapRemoteDevice* result = getRemoteDeviceByIP(ipAddr);
+		PcapRemoteDevice* result = getDeviceByIP(ipAddr);
 		return result;
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const IPAddress& ipAddr) const
+	{
+		return getDeviceByIP(ipAddr);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const IPAddress& ipAddr) const
 	{
 		if (ipAddr.getType() == IPAddress::IPv4AddressType)
 		{
-			return getRemoteDeviceByIP(ipAddr.getIPv4());
+			return getDeviceByIP(ipAddr.getIPv4());
 		}
 		else  // IPAddress::IPv6AddressType
 		{
-			return getRemoteDeviceByIP(ipAddr.getIPv6());
+			return getDeviceByIP(ipAddr.getIPv6());
 		}
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const IPv4Address& ip4Addr) const
+	{
+		return getDeviceByIP(ip4Addr);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const IPv4Address& ip4Addr) const
 	{
 		auto it = std::find_if(m_DeviceList.begin(), m_DeviceList.end(), [&ip4Addr](PcapRemoteDevice const* devPtr) {
 			auto devIP = devPtr->getIPv4Address();
@@ -161,6 +176,11 @@ namespace pcpp
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const IPv6Address& ip6Addr) const
+	{
+		return getDeviceByIP(ip6Addr);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const IPv6Address& ip6Addr) const
 	{
 		auto it = std::find_if(m_DeviceList.begin(), m_DeviceList.end(), [&ip6Addr](PcapRemoteDevice const* devPtr) {
 			auto devIP = devPtr->getIPv6Address();

Pcap++/src/PfRingDeviceList.cpp

@@ -111,6 +111,11 @@ namespace pcpp
 	}
 
 	PfRingDevice* PfRingDeviceList::getPfRingDeviceByName(const std::string& devName) const
+	{
+		return getDeviceByName(devName);
+	}
+
+	PfRingDevice* PfRingDeviceList::getDeviceByName(const std::string& devName) const
 	{
 		PCPP_LOG_DEBUG("Searching all live devices...");
 		auto devIter = std::find_if(m_DeviceList.begin(), m_DeviceList.end(),