Customizable parser configuration

Packet++/CMakeLists.txt

@@ -37,6 +37,7 @@ add_library(
   src/Packet.cpp
   src/PacketTrailerLayer.cpp
   src/PacketUtils.cpp
+  src/ParserConfig.cpp
   src/PayloadLayer.cpp
   src/PPPoELayer.cpp
   src/RadiusLayer.cpp
@@ -111,6 +112,7 @@ set(
   header/Packet.h
   header/PacketTrailerLayer.h
   header/PacketUtils.h
+  header/ParserConfig.h
   header/PayloadLayer.h
   header/PPPoELayer.h
   header/ProtocolType.h

Packet++/header/ArpLayer.h

@@ -239,7 +239,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Does nothing for this layer (ArpLayer is always last)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return The size of @ref arphdr

Packet++/header/BgpLayer.h

@@ -84,7 +84,7 @@ namespace pcpp
 
 		/// 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;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		std::string toString() const override;
 

Packet++/header/CiscoHdlcLayer.h

@@ -73,7 +73,7 @@ namespace pcpp
 		void computeCalculateFields() override;
 
 		/// Parses the next layer. Currently, supports IPv4 and IPv6
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		std::string toString() const override;
 

Packet++/header/CotpLayer.h

@@ -76,7 +76,7 @@ namespace pcpp
 		{}
 
 		/// Currently parses the rest of the packet as a S7COMM or generic payload (PayloadLayer)
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// A static method that takes a byte array and detects whether it is a COTP
 		/// @param[in] data A byte array

Packet++/header/DhcpLayer.h

@@ -733,7 +733,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Does nothing for this layer (DhcpLayer is always last)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return The size of @ref dhcp_header + size of options

Packet++/header/DhcpV6Layer.h

@@ -349,7 +349,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Does nothing for this layer (DhcpV6Layer is always last)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return The size of @ref dhcpv6_header + size of options

Packet++/header/DnsLayer.h

@@ -350,7 +350,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Does nothing for this layer (DnsLayer is always last)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return The size of the DNS data in the packet including he DNS header and size of all queries, answers,

Packet++/header/EthDot3Layer.h

@@ -94,7 +94,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Parses next layer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of ether_dot3_header
 		size_t getHeaderLen() const override

Packet++/header/EthLayer.h

@@ -132,7 +132,7 @@ namespace pcpp
 
 		/// Currently identifies the following next layers: IPv4Layer, IPv6Layer, ArpLayer, VlanLayer,
 		/// PPPoESessionLayer, PPPoEDiscoveryLayer, MplsLayer. Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of ether_header
 		size_t getHeaderLen() const override

Packet++/header/FtpLayer.h

@@ -36,7 +36,7 @@ namespace pcpp
 		// overridden methods
 
 		/// FTP is the always last so does nothing for this layer
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return Get the size of the layer

Packet++/header/GreLayer.h

@@ -128,7 +128,7 @@ namespace pcpp
 		/// Currently identifies the following next layers:
 		///   IPv4Layer, IPv6Layer, VlanLayer, MplsLayer, PPP_PPTPLayer, EthLayer, EthDot3Layer
 		/// Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of GRE header (may change if optional fields are added or removed)
 		size_t getHeaderLen() const override;
@@ -368,7 +368,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Currently identifies the following next layers: IPv4Layer, IPv6Layer. Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return The size of @ref ppp_pptp_header
 		size_t getHeaderLen() const override

Packet++/header/GtpLayer.h

@@ -391,7 +391,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Identifies the following next layers for GTP-U packets: IPv4Layer, IPv6Layer. Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return The size of the GTP header. For GTP-C packets the size is determined by the value of
 		/// gtpv1_header#messageLength and for GTP-U the size only includes the GTP header itself (meaning
@@ -1099,7 +1099,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Identifies if the next layer is GTPv2 piggyback. Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return The size of the GTPv2 header including its Information Elements (IE)
 		size_t getHeaderLen() const override;

Packet++/header/IPSecLayer.h

@@ -93,7 +93,7 @@ namespace pcpp
 
 		/// Currently identifies the following next layers: UdpLayer, TcpLayer, IPv4Layer, IPv6Layer and ESPLayer.
 		/// Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// Does nothing for this layer
 		void computeCalculateFields() override
@@ -152,7 +152,7 @@ namespace pcpp
 		}
 
 		/// The payload of an ESP layer is encrypted, hence the next layer is always a generic payload (PayloadLayer)
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// Does nothing for this layer
 		void computeCalculateFields() override

Packet++/header/IPv4Layer.h

@@ -575,7 +575,7 @@ namespace pcpp
 		/// - ESPLayer (IPSec)
 		///
 		/// Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of IPv4 header (including IPv4 options if exist)
 		size_t getHeaderLen() const override

Packet++/header/IPv6Layer.h

@@ -168,7 +168,7 @@ namespace pcpp
 		/// - ESPLayer (IPSec)
 		///
 		/// Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of @ref ip6_hdr
 		size_t getHeaderLen() const override

Packet++/header/IcmpLayer.h

@@ -596,7 +596,7 @@ namespace pcpp
 		/// ICMP messages of types: ICMP_DEST_UNREACHABLE, ICMP_SOURCE_QUENCH, ICMP_TIME_EXCEEDED, ICMP_REDIRECT,
 		/// ICMP_PARAM_PROBLEM have data that contains IPv4 header and some L4 header (TCP/UDP/ICMP). This method parses
 		/// these headers as separate layers on top of the ICMP layer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return The ICMP header length. This length varies according to the ICMP message type. This length doesn't
 		/// include IPv4 and L4 headers in case ICMP message type are: ICMP_DEST_UNREACHABLE, ICMP_SOURCE_QUENCH,

Packet++/header/IcmpV6Layer.h

@@ -166,7 +166,7 @@ namespace pcpp
 		uint16_t getChecksum() const;
 
 		/// Does nothing for this layer. ICMPv6 is the last layer.
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return The size of the ICMPv6 message

Packet++/header/IgmpLayer.h

@@ -188,7 +188,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Does nothing for this layer (IGMP layer is always last)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return Size of IGMP header = 8B

Packet++/header/LLCLayer.h

@@ -53,7 +53,7 @@ namespace pcpp
 		// overridden methods
 
 		/// Parses the next layer. Currently only STP supported as next layer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// Does nothing for this layer
 		void computeCalculateFields() override

Packet++/header/Layer.h

@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "ProtocolType.h"
+#include "ParserConfig.h"
 #include <string>
 #include <stdexcept>
 #include <utility>
@@ -142,7 +143,12 @@ namespace pcpp
 		// abstract methods
 
 		/// Each layer is responsible for parsing the next layer
-		virtual void parseNextLayer() = 0;
+		void parseNextLayer()
+		{
+			parseNextLayer(ParserConfiguration::getDefault());
+		}
+
+		virtual void parseNextLayer(ParserConfiguration const& config) = 0;
 
 		/// @return The header length in bytes
 		virtual size_t getHeaderLen() const = 0;

Packet++/header/LdapLayer.h

@@ -359,7 +359,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Tries to identify more LDAP messages in this packet if exist
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return The size of the LDAP message
 		size_t getHeaderLen() const override

Packet++/header/MplsLayer.h

@@ -88,7 +88,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Currently identifies the following next layers: IPv4Layer, IPv6Layer, MplsLayer. Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of MPLS header (4 bytes)
 		size_t getHeaderLen() const override

Packet++/header/NflogLayer.h

@@ -184,7 +184,7 @@ namespace pcpp
 
 		/// Currently identifies the following next layers: IPv4Layer, IPv6Layer using address family
 		/// Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of nflog_header
 		size_t getHeaderLen() const override;

Packet++/header/NtpLayer.h

@@ -536,7 +536,7 @@ namespace pcpp
 		// overridden methods
 
 		/// Parses the next layer. NTP is the always last so does nothing for this layer
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return Get the size of the layer (Including the extension and authentication fields if exists)

Packet++/header/NullLoopbackLayer.h

@@ -60,7 +60,7 @@ namespace pcpp
 		/// - for ::PCPP_BSD_AF_INET6_BSD, ::PCPP_BSD_AF_INET6_FREEBSD, ::PCPP_BSD_AF_INET6_DARWIN the next layer is
 		/// IPv6Layer
 		/// - for other values the next layer in PayloadLayer (unknown protocol)
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of Null/Loopback header = 4B
 		size_t getHeaderLen() const override

Packet++/header/PPPoELayer.h

@@ -149,7 +149,7 @@ namespace pcpp
 		// abstract methods implementation
 
 		/// Currently identifies the following next layers: IPv4Layer, IPv6Layer. Otherwise sets PayloadLayer
-		void parseNextLayer() override;
+		void parseNextLayer(ParserConfiguration const& config) override;
 
 		/// @return Size of @ref pppoe_header
 		size_t getHeaderLen() const override
@@ -350,7 +350,7 @@ namespace pcpp
 		// abstract methods implementation
 
 		/// Does nothing for this layer (PPPoE discovery is always the last layer)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return The header length which is size of strcut pppoe_header plus the total size of tags

Packet++/header/PacketTrailerLayer.h

@@ -62,7 +62,7 @@ namespace pcpp
 		// implement abstract methods
 
 		/// Does nothing for this layer (PacketTrailerLayer is always last)
-		void parseNextLayer() override
+		void parseNextLayer(ParserConfiguration const& config) override
 		{}
 
 		/// @return trailer data length in bytes