Fix toyvpn include path

Author: clementperon

.github/workflows/build_and_test.yml

@@ -669,13 +669,11 @@ jobs:
         run: |
           TOYVPN_PCAPPLUSPLUS="./ToyVpn-PcapPlusPlus/app/libs/pcapplusplus"
           PCAPPLUSPLUS_LIBS_PATH="$TOYVPN_PCAPPLUSPLUS/${{ matrix.target }}/${{ matrix.api-version }}"
-          PCAPPLUSPLUS_INCLUDE_PATH="$TOYVPN_PCAPPLUSPLUS/include"
           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}
-          mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a ${PCAPPLUSPLUS_LIBS_PATH}/
-          mv ${TOYVPN_PCAPPLUSPLUS}/include/pcapplusplus/*.h ${PCAPPLUSPLUS_INCLUDE_PATH}/
+          cmake --install "$BUILD_DIR" --prefix "${TOYVPN_PCAPPLUSPLUS}"
+          mkdir -p "${PCAPPLUSPLUS_LIBS_PATH}" "${PCAPPLUSPLUS_INCLUDE_PATH}"
+          mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a "${PCAPPLUSPLUS_LIBS_PATH}/"
 
       - name: Build ToyVpn-PcapPlusPlus
         working-directory: ./ToyVpn-PcapPlusPlus

Examples/Tutorials/Tutorial-LiveTraffic/main.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <algorithm>
-#include "PcapLiveDeviceList.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
 /**
  * A struct for collecting packet statistics
  */

Tests/Pcap++Test/Tests/PacketParsingTests.cpp

@@ -2,18 +2,10 @@
 #include "../Common/PcapFileNamesDef.h"
 #include <sstream>
 #include <fstream>
-<<<<<<< HEAD
-#include "Packet.h"
-#include "HttpLayer.h"
-#include "DnsLayer.h"
-#include "PcapFileDevice.h"
-=======
-#include <stdlib.h>
 #include "pcapplusplus/Packet.h"
 #include "pcapplusplus/HttpLayer.h"
 #include "pcapplusplus/DnsLayer.h"
 #include "pcapplusplus/PcapFileDevice.h"
->>>>>>> c5dfc41d (Remove ifdef inside cpp)
 
 PTF_TEST_CASE(TestHttpRequestParsing)
 {