More fixes

seladb · Oct 6, 2024 · 67fdf63 · 67fdf63
1 parent beacbf4
commit 67fdf63
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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