Refactor DHCP port checking code in DhcpLayer (#1546)

seladb · Aug 23, 2024 · fdd4caf · fdd4caf
1 parent 91cde5e
commit fdd4caf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Packet++/header/DhcpLayer.h b/Packet++/header/DhcpLayer.h
@@ -821,6 +821,14 @@ namespace pcpp
 		 */
 		bool removeAllOptions();
 
+		/**
+		 * A static method that checks whether a pair of ports are considered DHCP ports
+		 * @param[in] portSrc The source port number to check
+		 * @param[in] portDst The destination port number to check
+		 * @return True if these are DHCP port numbers, false otherwise
+		 */
+		static inline bool isDhcpPorts(uint16_t portSrc, uint16_t portDst);
+
 		// implement abstract methods
 
 		/**
@@ -868,4 +876,13 @@ namespace pcpp
 
 		DhcpOption addOptionAt(const DhcpOptionBuilder& optionBuilder, int offset);
 	};
+
+	// implementation of inline methods
+
+	bool DhcpLayer::isDhcpPorts(uint16_t portSrc, uint16_t portDst)
+	{
+		return ((portSrc == 68 && portDst == 67) || (portSrc == 67 && portDst == 68) ||
+		        (portSrc == 67 && portDst == 67));
+	}
+
 }  // namespace pcpp
diff --git a/Packet++/src/UdpLayer.cpp b/Packet++/src/UdpLayer.cpp
@@ -100,7 +100,7 @@ namespace pcpp
 		uint8_t* udpData = m_Data + sizeof(udphdr);
 		size_t udpDataLen = m_DataLen - sizeof(udphdr);
 
-		if ((portSrc == 68 && portDst == 67) || (portSrc == 67 && portDst == 68) || (portSrc == 67 && portDst == 67))
+		if (DhcpLayer::isDhcpPorts(portSrc, portDst))
 			m_NextLayer = new DhcpLayer(udpData, udpDataLen, this, m_Packet);
 		else if (VxlanLayer::isVxlanPort(portDst))
 			m_NextLayer = new VxlanLayer(udpData, udpDataLen, this, m_Packet);