Customizable parser configuration

Benchmarks/CMakeLists.txt

@@ -0,0 +1,23 @@
+
+include(FetchContent)
+
+if(NOT (
+    (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
+    AND (NOT MINGW)
+    AND (NOT CMAKE_OSX_ARCHITECTURES OR (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_OSX_ARCHITECTURES))
+   )
+)
+    message(WARNING "Google Benchmark backend is not supported for cross-compilation")
+    return()
+endif()
+
+# Fetch Google Benchmark
+FetchContent_Declare(benchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.9.0)
+
+# Disable testing and installation for Google Benchmark
+set(BENCHMARK_ENABLE_TESTING OFF)
+set(BENCHMARK_ENABLE_INSTALL OFF)
+FetchContent_MakeAvailable(benchmark)
+
+# Add PcapPlusPlus benchmarks
+add_subdirectory(Packet++Bench)

Benchmarks/Packet++Bench/Benchmarks/PortMapperBench.cpp

@@ -0,0 +1,99 @@
+#include <vector>
+#include <benchmark\benchmark.h>
+
+#include "ParserConfig.h"
+
+namespace pcpp_bench
+{
+	using namespace pcpp;
+
+	namespace
+	{
+		void PortMapperStaticLookupSingle(benchmark::State& state)
+		{
+			ParserConfiguration& config = ParserConfiguration::getDefault();
+			PortMapper& portMapper = config.portMapper;
+
+			size_t totalLookups = 0;
+			for (auto _ : state)
+			{
+				PortPair portPair(80, 443);
+				auto protocol = portMapper.getProtocolByPortPair(portPair);
+				benchmark::DoNotOptimize(protocol);
+				totalLookups++;
+			}
+
+			state.SetItemsProcessed(totalLookups);
+		}
+		BENCHMARK(PortMapperStaticLookupSingle);
+
+		void PortMapperStaticLookupMatrix(benchmark::State& state)
+		{
+			ParserConfiguration& config = ParserConfiguration::getDefault();
+			PortMapper& portMapper = config.portMapper;
+
+			size_t totalLookups = 0;
+			for (auto _ : state)
+			{
+				PortPair portPair(80, 443);
+				auto matrix = portMapper.getMatchMatrix(portPair);
+				benchmark::DoNotOptimize(matrix);
+				totalLookups++;
+			}
+			state.SetItemsProcessed(totalLookups);
+		}
+		BENCHMARK(PortMapperStaticLookupMatrix);
+
+		void PortMapperDynamicLookupSingle(benchmark::State& state)
+		{
+			ParserConfiguration& config = ParserConfiguration::getDefault();
+			PortMapper& portMapper = config.portMapper;
+			size_t totalLookups = 0;
+
+			// Generate random port pairs for dynamic lookups
+			std::vector<PortPair> inputPorts{
+				PortPair{ 80, 65440 },
+				PortPair{ 64000, 64002 },
+			};
+
+			for (auto _ : state)
+			{
+				// Simulate dynamic port pairs by cycling through a predefined set
+				PortPair const& portPair = inputPorts[totalLookups % inputPorts.size()];
+
+				auto protocol = portMapper.getProtocolByPortPair(portPair);
+				benchmark::DoNotOptimize(protocol);
+				totalLookups++;
+			}
+
+			state.SetItemsProcessed(totalLookups);
+		}
+		BENCHMARK(PortMapperDynamicLookupSingle);
+
+		void PortMapperDynamicLookupMatrix(benchmark::State& state)
+		{
+			ParserConfiguration& config = ParserConfiguration::getDefault();
+			PortMapper& portMapper = config.portMapper;
+			size_t totalLookups = 0;
+
+			// Generate random port pairs for dynamic lookups
+			std::vector<PortPair> inputPorts{
+				PortPair{ 80, 65440 },
+				PortPair{ 64000, 64002 },
+			};
+
+			for (auto _ : state)
+			{
+				// Simulate dynamic port pairs by cycling through a predefined set
+				PortPair const& portPair = inputPorts[totalLookups % inputPorts.size()];
+
+				auto matrix = portMapper.getMatchMatrix(portPair);
+				benchmark::DoNotOptimize(matrix);
+				totalLookups++;
+			}
+
+			state.SetItemsProcessed(totalLookups);
+		}
+		BENCHMARK(PortMapperDynamicLookupMatrix);
+	}  // namespace
+}  // namespace pcpp_bench

Benchmarks/Packet++Bench/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.14)
+
+add_executable(Packet++Bench
+  "main.cpp"
+  "Benchmarks/PortMapperBench.cpp"
+)
+
+target_link_libraries(Packet++Bench PUBLIC PcapPlusPlus::Pcap++ benchmark::benchmark)

Benchmarks/Packet++Bench/main.cpp

@@ -0,0 +1,12 @@
+
+#include <benchmark\benchmark.h>
+
+int main(int argc, char** argv)
+{
+    // Initialize the benchmark library
+    benchmark::Initialize(&argc, argv);
+
+    // Run all benchmarks
+    benchmark::RunSpecifiedBenchmarks();
+    return 0;
+}

CMakeLists.txt

@@ -149,6 +149,7 @@ cmake_dependent_option(
   OFF
 )
 option(PCAPPP_BUILD_TESTS "Build Tests" ${PCAPPP_MAIN_PROJECT})
+option(PCAPPP_BUILD_BENCHMARK "Build Benchmark Targets" OFF)
 option(PCAPPP_BUILD_COVERAGE "Generate Coverage Report" OFF)
 option(PCAPPP_BUILD_FUZZERS "Build Fuzzers binaries" OFF)
 option(PCAPPP_BUILD_REPRODUCIBLE "Build a reproducible version" OFF)
@@ -358,6 +359,10 @@ if(PCAPPP_BUILD_TESTS OR PCAPPP_BUILD_FUZZERS OR PCAPPP_BUILD_EXAMPLES)
   add_subdirectory(Tests)
 endif()
 
+if(PCAPPP_BUILD_BENCHMARK)
+    add_subdirectory(Benchmarks)
+endif()
+
 if(PCAPPP_INSTALL)
   # Generate PKG-Config for non WIN32 system
   if(NOT WIN32)

Packet++/CMakeLists.txt

@@ -40,6 +40,7 @@ add_library(
   src/Packet.cpp
   src/PacketTrailerLayer.cpp
   src/PacketUtils.cpp
+  src/ParserConfig.cpp
   src/PayloadLayer.cpp
   src/PemCodec.cpp
   src/PPPoELayer.cpp
@@ -118,6 +119,7 @@ set(
   header/Packet.h
   header/PacketTrailerLayer.h
   header/PacketUtils.h
+  header/ParserConfig.h
   header/PayloadLayer.h
   header/PemCodec.h
   header/PPPoELayer.h

Packet++/header/ArpLayer.h

@@ -238,10 +238,6 @@ namespace pcpp
 
 		// implement abstract methods
 
-		/// Does nothing for this layer (ArpLayer is always last)
-		void parseNextLayer() override
-		{}
-
 		/// @return The size of @ref arphdr
 		size_t getHeaderLen() const override
 		{
@@ -280,6 +276,11 @@ namespace pcpp
 		{
 			return canReinterpretAs<arphdr>(data, dataLen);
 		}
+
+	protected:
+		/// Does nothing for this layer (ArpLayer is always last)
+		void doParseNextLayer(ParserConfiguration const& config) override
+		{}
 	};
 
 }  // namespace pcpp

Packet++/header/BgpLayer.h

@@ -82,10 +82,6 @@ namespace pcpp
 		/// @return The size of the BGP message
 		size_t getHeaderLen() const override;
 
-		/// Multiple BGP messages can reside in a single packet, and the only layer that can come after a BGP message
-		/// is another BGP message. This method checks for remaining data and parses it as another BGP layer
-		void parseNextLayer() override;
-
 		std::string toString() const override;
 
 		OsiModelLayer getOsiModelLayer() const override
@@ -107,6 +103,10 @@ namespace pcpp
 		    : Layer(data, dataLen, prevLayer, packet, BGP)
 		{}
 
+		/// Multiple BGP messages can reside in a single packet, and the only layer that can come after a BGP message
+		/// is another BGP message. This method checks for remaining data and parses it as another BGP layer
+		void doParseNextLayer(ParserConfiguration const& config) override;
+
 		bgp_common_header* getBasicHeader() const
 		{
 			return reinterpret_cast<bgp_common_header*>(m_Data);

Packet++/header/CiscoHdlcLayer.h

@@ -72,16 +72,17 @@ namespace pcpp
 		/// Calculate the Next Protocol when possible
 		void computeCalculateFields() override;
 
-		/// Parses the next layer. Currently, supports IPv4 and IPv6
-		void parseNextLayer() override;
-
 		std::string toString() const override;
 
 		OsiModelLayer getOsiModelLayer() const override
 		{
 			return OsiModelDataLinkLayer;
 		}
 
+	protected:
+		/// Parses the next layer. Currently, supports IPv4 and IPv6
+		void doParseNextLayer(ParserConfiguration const& config) override;
+
 	private:
 #pragma pack(push, 1)
 		struct cisco_hdlc_header

Packet++/header/CotpLayer.h

@@ -75,9 +75,6 @@ namespace pcpp
 		void computeCalculateFields() override
 		{}
 
-		/// Currently parses the rest of the packet as a S7COMM or generic payload (PayloadLayer)
-		void parseNextLayer() override;
-
 		/// A static method that takes a byte array and detects whether it is a COTP
 		/// @param[in] data A byte array
 		/// @param[in] dataSize The byte array size (in bytes)
@@ -91,6 +88,10 @@ namespace pcpp
 			return OsiModelTransportLayer;
 		}
 
+	protected:
+		/// Currently parses the rest of the packet as a S7COMM or generic payload (PayloadLayer)
+		void doParseNextLayer(ParserConfiguration const& config) override;
+
 	private:
 		cotphdr* getCotpHeader() const
 		{

Packet++/header/DhcpLayer.h

@@ -732,10 +732,6 @@ namespace pcpp
 
 		// implement abstract methods
 
-		/// Does nothing for this layer (DhcpLayer is always last)
-		void parseNextLayer() override
-		{}
-
 		/// @return The size of @ref dhcp_header + size of options
 		size_t getHeaderLen() const override
 		{
@@ -759,6 +755,11 @@ namespace pcpp
 			return OsiModelApplicationLayer;
 		}
 
+	protected:
+		/// Does nothing for this layer (DhcpLayer is always last)
+		void doParseNextLayer(ParserConfiguration const& config) override
+		{}
+
 	private:
 		uint8_t* getOptionsBasePtr() const
 		{

Packet++/header/DhcpV6Layer.h

@@ -348,10 +348,6 @@ namespace pcpp
 
 		// implement abstract methods
 
-		/// Does nothing for this layer (DhcpV6Layer is always last)
-		void parseNextLayer() override
-		{}
-
 		/// @return The size of @ref dhcpv6_header + size of options
 		size_t getHeaderLen() const override
 		{
@@ -369,6 +365,11 @@ namespace pcpp
 			return OsiModelApplicationLayer;
 		}
 
+	protected:
+		/// Does nothing for this layer (DhcpV6Layer is always last)
+		void doParseNextLayer(ParserConfiguration const& config) override
+		{}
+
 	private:
 		uint8_t* getOptionsBasePtr() const
 		{

Packet++/header/DnsLayer.h

@@ -349,10 +349,6 @@ namespace pcpp
 
 		// implement abstract methods
 
-		/// Does nothing for this layer (DnsLayer is always last)
-		void parseNextLayer() override
-		{}
-
 		/// @return The size of the DNS data in the packet including he DNS header and size of all queries, answers,
 		/// authorities and additional records
 		size_t getHeaderLen() const override
@@ -388,6 +384,10 @@ namespace pcpp
 		DnsLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet, size_t offsetAdjustment);
 		explicit DnsLayer(size_t offsetAdjustment);
 
+		/// Does nothing for this layer (DnsLayer is always last)
+		void doParseNextLayer(ParserConfiguration const& config) override
+		{}
+
 	private:
 		IDnsResource* m_ResourceList;
 		DnsQuery* m_FirstQuery;

Packet++/header/DoIpLayer.h

@@ -620,9 +620,6 @@ namespace pcpp
 
 		// implement abstract methods
 
-		/// parse UDS layer
-		void parseNextLayer() override;
-
 		/// @return The size of @ref doiphdr + attached fields length
 		size_t getHeaderLen() const override
 		{
@@ -639,6 +636,10 @@ namespace pcpp
 			return OsiModelApplicationLayer;
 		}
 
+	protected:
+		/// parse UDS layer
+		void doParseNextLayer(ParserConfiguration const& config) override;
+
 	private:
 		void setPayloadType(DoIpPayloadTypes payloadType);
 

Packet++/header/EthDot3Layer.h

@@ -93,9 +93,6 @@ namespace pcpp
 
 		// implement abstract methods
 
-		/// Parses next layer
-		void parseNextLayer() override;
-
 		/// @return Size of ether_dot3_header
 		size_t getHeaderLen() const override
 		{
@@ -118,6 +115,10 @@ namespace pcpp
 		/// @param[in] dataLen The length of the byte stream
 		/// @return True if the data is valid and can represent an IEEE 802.3 Eth packet
 		static bool isDataValid(const uint8_t* data, size_t dataLen);
+
+	protected:
+		/// Parses next layer
+		void doParseNextLayer(ParserConfiguration const& config) override;
 	};
 
 }  // namespace pcpp