Added ProtocolType to Layer constructor. (#1559)

Author: Dimi1010

Packet++/header/ArpLayer.h

@@ -67,9 +67,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		ArpLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
+		    : Layer(data, dataLen, prevLayer, packet, ARP)
 		{
-			m_Protocol = ARP;
 			m_DataLen = sizeof(arphdr);
 		}
 

Packet++/header/BgpLayer.h

@@ -127,10 +127,8 @@ namespace pcpp
 		BgpLayer()
 		{}
 		BgpLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = BGP;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, BGP)
+		{}
 
 		bgp_common_header* getBasicHeader() const
 		{

Packet++/header/CotpLayer.h

@@ -37,10 +37,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		CotpLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = COTP;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, COTP)
+		{}
 
 		/**
 		 * A constructor that allocates a new COTP header

Packet++/header/EthDot3Layer.h

@@ -41,10 +41,9 @@ namespace pcpp
 		 * @param[in] dataLen Size of the data in bytes
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
-		EthDot3Layer(uint8_t* data, size_t dataLen, Packet* packet) : Layer(data, dataLen, nullptr, packet)
-		{
-			m_Protocol = EthernetDot3;
-		}
+		EthDot3Layer(uint8_t* data, size_t dataLen, Packet* packet)
+		    : Layer(data, dataLen, nullptr, packet, EthernetDot3)
+		{}
 
 		/**
 		 * A constructor that creates the layer from an existing packet raw data
@@ -54,10 +53,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		EthDot3Layer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = EthernetDot3;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, EthernetDot3)
+		{}
 
 		/**
 		 * A constructor that creates a new IEEE 802.3 Ethernet header and allocates the data

Packet++/header/EthLayer.h

@@ -78,10 +78,8 @@ namespace pcpp
 		 * @param[in] dataLen Size of the data in bytes
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
-		EthLayer(uint8_t* data, size_t dataLen, Packet* packet) : Layer(data, dataLen, nullptr, packet)
-		{
-			m_Protocol = Ethernet;
-		}
+		EthLayer(uint8_t* data, size_t dataLen, Packet* packet) : Layer(data, dataLen, nullptr, packet, Ethernet)
+		{}
 
 		/**
 		 * A constructor that creates the layer from an existing packet raw data
@@ -91,10 +89,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		EthLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = Ethernet;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, Ethernet)
+		{}
 
 		/**
 		 * A constructor that creates a new Ethernet header and allocates the data

Packet++/header/FtpLayer.h

@@ -19,14 +19,9 @@ namespace pcpp
 	{
 	protected:
 		FtpLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : SingleCommandTextProtocol(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = FTP;
-		};
-		FtpLayer(const std::string& command, const std::string& option) : SingleCommandTextProtocol(command, option)
-		{
-			m_Protocol = FTP;
-		};
+		    : SingleCommandTextProtocol(data, dataLen, prevLayer, packet, FTP) {};
+		FtpLayer(const std::string& command, const std::string& option)
+		    : SingleCommandTextProtocol(command, option, FTP) {};
 
 	public:
 		/**

Packet++/header/GreLayer.h

@@ -160,8 +160,8 @@ namespace pcpp
 		}
 
 	protected:
-		GreLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
+		GreLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet, ProtocolType protocol)
+		    : Layer(data, dataLen, prevLayer, packet, protocol)
 		{}
 
 		GreLayer()
@@ -196,10 +196,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		GREv0Layer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : GreLayer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = GREv0;
-		}
+		    : GreLayer(data, dataLen, prevLayer, packet, GREv0)
+		{}
 
 		/**
 		 * A constructor that creates a new GREv0 header and allocates the data
@@ -322,10 +320,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		GREv1Layer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : GreLayer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = GREv1;
-		}
+		    : GreLayer(data, dataLen, prevLayer, packet, GREv1)
+		{}
 
 		/**
 		 * A constructor that creates a new GREv1 header and allocates the data
@@ -414,10 +410,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		PPP_PPTPLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = PPP_PPTP;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, PPP_PPTP)
+		{}
 
 		/**
 		 * A constructor that allocates a new PPP-PPTP header

Packet++/header/GtpLayer.h

@@ -317,10 +317,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		GtpV1Layer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = GTPv1;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, GTPv1)
+		{}
 
 		/**
 		 * A constructor that creates a new GTPv1 layer and sets the message type and the TEID value

Packet++/header/HttpLayer.h

@@ -100,8 +100,8 @@ namespace pcpp
 		}
 
 	protected:
-		HttpMessage(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : TextBasedProtocolMessage(data, dataLen, prevLayer, packet)
+		HttpMessage(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet, ProtocolType protocol)
+		    : TextBasedProtocolMessage(data, dataLen, prevLayer, packet, protocol)
 		{}
 		HttpMessage() : TextBasedProtocolMessage()
 		{}

Packet++/header/IPSecLayer.h

@@ -58,10 +58,8 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		AuthenticationHeaderLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = AuthenticationHeader;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, AuthenticationHeader)
+		{}
 
 		/**
 		 * Get a pointer to the raw AH header. Notice this points directly to the data, so every change will change the
@@ -155,14 +153,12 @@ namespace pcpp
 		 * @param[in] packet A pointer to the Packet instance where layer will be stored in
 		 */
 		ESPLayer(uint8_t* data, size_t dataLen, Layer* prevLayer, Packet* packet)
-		    : Layer(data, dataLen, prevLayer, packet)
-		{
-			m_Protocol = ESP;
-		}
+		    : Layer(data, dataLen, prevLayer, packet, ESP)
+		{}
 
 		ipsec_esp* getESPHeader() const
 		{
-			return (ipsec_esp*)m_Data;
+			return reinterpret_cast<ipsec_esp*>(m_Data);
 		}
 
 		/**