From 67fdf637ef416f5c8c493470cf6e6d0cf449afa4 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

---
 .github/workflows/build_and_test.yml                   |  2 +-
 Examples/DpdkBridge/Common.h                           |  7 +++----
 Examples/DpdkExample-FilterTraffic/Common.h            |  7 +++----
 .../DpdkExample-FilterTraffic/PacketMatchingEngine.h   | 10 +++++-----
 Examples/PfRingExample-FilterTraffic/Common.h          |  7 -------
 .../PfRingExample-FilterTraffic/PacketMatchingEngine.h |  8 --------
 .../XdpExample-FilterTraffic/PacketMatchingEngine.h    | 10 +++++-----
 7 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 204edf5319..26a035f3e8 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -672,7 +672,7 @@ jobs:
           cmake -DPCAPPP_BUILD_COVERAGE=OFF -S . -B "$BUILD_DIR"
           cmake --build "$BUILD_DIR" -j
           cmake --install "$BUILD_DIR" --prefix "${TOYVPN_PCAPPLUSPLUS}"
-          mkdir -p "${PCAPPLUSPLUS_LIBS_PATH}" "${PCAPPLUSPLUS_INCLUDE_PATH}"
+          mkdir -p "${PCAPPLUSPLUS_LIBS_PATH}"
           mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a "${PCAPPLUSPLUS_LIBS_PATH}/"
 
       - name: Build ToyVpn-PcapPlusPlus
diff --git a/Examples/DpdkBridge/Common.h b/Examples/DpdkBridge/Common.h
index 1cfdff2d04..1c6a805db9 100644
--- a/Examples/DpdkBridge/Common.h
+++ b/Examples/DpdkBridge/Common.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "Packet.h"
-#include "DpdkDevice.h"
-
-#include <SystemUtils.h>
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <string>
 #include <unordered_map>
diff --git a/Examples/DpdkExample-FilterTraffic/Common.h b/Examples/DpdkExample-FilterTraffic/Common.h
index 0ff1444131..747313f6af 100644
--- a/Examples/DpdkExample-FilterTraffic/Common.h
+++ b/Examples/DpdkExample-FilterTraffic/Common.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "Packet.h"
-#include "DpdkDevice.h"
-
-#include <SystemUtils.h>
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #include <string>
 #include <unordered_map>
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/Common.h b/Examples/PfRingExample-FilterTraffic/Common.h
index 9f16951e71..b8fee3e0d1 100644
--- a/Examples/PfRingExample-FilterTraffic/Common.h
+++ b/Examples/PfRingExample-FilterTraffic/Common.h
@@ -1,19 +1,12 @@
 #pragma once
 
-<<<<<<< HEAD
-#include <Packet.h>
-#include <PfRingDeviceList.h>
-=======
 #include "pcapplusplus/Packet.h"
 #include "pcapplusplus/PfRingDeviceList.h"
 
-#include "pcapplusplus/SystemUtils.h"
-
 #include <string>
 #include <vector>
 #include <iomanip>
 #include <iostream>
->>>>>>> c5dfc41d (Remove ifdef inside cpp)
 #include <sstream>
 
 /**
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