Merge remote-tracking branch 'upstream/dev' into gvcp_0410

seladb · Sep 28, 2024 · 655fef5 · 655fef5
2 parents 1c45bc6 + 3919812
commit 655fef5
Show file tree

Hide file tree

Showing 16 changed files with 1,251 additions and 47 deletions.
diff --git a/Common++/header/Logger.h b/Common++/header/Logger.h
@@ -104,6 +104,7 @@ namespace pcpp
 		PacketLogModuleSomeIpSdLayer,    ///< SomeIpSdLayer module (Packet++)
 		PacketLogModuleWakeOnLanLayer,   ///< WakeOnLanLayer module (Packet++)
 		PacketLogModuleSmtpLayer,        ///< SmtpLayer module (Packet++)
+		PacketLogModuleWireGuardLayer,   ///< WireGuardLayer module (Packet++)
 		PcapLogModuleWinPcapLiveDevice,  ///< WinPcapLiveDevice module (Pcap++)
 		PcapLogModuleRemoteDevice,       ///< WinPcapRemoteDevice module (Pcap++)
 		PcapLogModuleLiveDevice,         ///< PcapLiveDevice module (Pcap++)

diff --git a/Packet++/CMakeLists.txt b/Packet++/CMakeLists.txt
@@ -65,6 +65,7 @@ add_library(
   src/VrrpLayer.cpp
   src/VxlanLayer.cpp
   src/WakeOnLanLayer.cpp
+  src/WireGuardLayer.cpp
   # Force hash-library pcapng to be link fully static
 )
 
@@ -135,7 +136,8 @@ set(public_headers
     header/VlanLayer.h
     header/VrrpLayer.h
     header/VxlanLayer.h
-    header/WakeOnLanLayer.h)
+    header/WakeOnLanLayer.h
+    header/WireGuardLayer.h)
 
 # Don't use set_target_properties CMake limit to 50 elements
 set_property(TARGET Packet++ PROPERTY PUBLIC_HEADER ${public_headers})

diff --git a/Packet++/header/ProtocolType.h b/Packet++/header/ProtocolType.h
@@ -347,10 +347,15 @@ namespace pcpp
 	 */
 	const ProtocolType LDAP = 55;
 
+	/*
+	 * WireGuard protocol
+	 */
+	const ProtocolType WireGuard = 56;
+
 	/*
 	 * GVCP protocol
 	 */
-	const ProtocolType Gvcp = 56;
+	const ProtocolType Gvcp = 57;
 
 	/**
 	 * An enum representing OSI model layers