From f1bc5a916dcc882903a07250851d6e80b99616d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <cpe@outsight.tech>
Date: Sun, 6 Oct 2024 10:39:51 +0200
Subject: [PATCH] More fixes

---
 .../DpdkExample-FilterTraffic/PacketMatchingEngine.h   | 10 +++++-----
 .../PfRingExample-FilterTraffic/PacketMatchingEngine.h |  8 --------
 .../XdpExample-FilterTraffic/PacketMatchingEngine.h    | 10 +++++-----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h b/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h
index e5354898ed..540f061236 100644
--- a/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/DpdkExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * Responsible for matching packets by match criteria received from the user. Current match criteria are a combination
diff --git a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
index ba6deaa198..a34579c131 100644
--- a/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/PfRingExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,17 +1,9 @@
 #pragma once
 
-<<<<<<< HEAD
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-=======
-#include "pcapplusplus/SystemUtils.h"
 #include "pcapplusplus/Packet.h"
 #include "pcapplusplus/IPv4Layer.h"
 #include "pcapplusplus/TcpLayer.h"
 #include "pcapplusplus/UdpLayer.h"
->>>>>>> c5dfc41d (Remove ifdef inside cpp)
 
 /**
  * Responsible for matching packets by match criteria received from the user. Current match criteria are a combination
diff --git a/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h b/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h
index e5354898ed..540f061236 100644
--- a/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h
+++ b/Examples/XdpExample-FilterTraffic/PacketMatchingEngine.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * Responsible for matching packets by match criteria received from the user. Current match criteria are a combination