Force pcapplusplus prefix in include

.github/workflows/build_and_test.yml

@@ -681,13 +681,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}"
+          mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a "${PCAPPLUSPLUS_LIBS_PATH}/"
 
       - name: Set up JDK
         uses: actions/setup-java@v4

3rdParty/Getopt-for-Visual-Studio/getopt.h

@@ -68,6 +68,8 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
+/* Enforce Windows.h to use winsock2 */
+#include <winsock2.h>
 #include <windows.h>
 
 #ifdef __cplusplus

CMakeLists.txt

@@ -124,6 +124,21 @@ option(PCAPPP_BUILD_COVERAGE "Generate Coverage Report" OFF)
 option(PCAPPP_BUILD_FUZZERS "Build Fuzzers binaries" OFF)
 option(PCAPPP_BUILD_REPRODUCIBLE "Build a reproducible version" OFF)
 
+option(
+  PCAPPP_ENABLE_OLD_STYLE_INCLUDE
+  "Enables old style include paths that directly add pcapplusplus folder as an include root."
+  ON
+)
+if(PCAPPP_ENABLE_OLD_STYLE_INCLUDE)
+  message(
+    DEPRECATION
+    "PcapPlusPlus: Old style include directories are enabled, directly adding the <pcapplusplus> folder to the include directories."
+    "This functionality is deprecated and will be removed in the future."
+    "New include format should follow: \"#include <pcapplusplus/xxx.h>\" "
+    "This behaviour can be disabled by setting \"PCAPPP_ENABLE_OLD_STYLE_INCLUDE\" to OFF"
+  )
+endif()
+
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 
 option(PCAPPP_USE_DPDK "Setup PcapPlusPlus with DPDK. In this case you must also set DPDK_ROOT")

Common++/CMakeLists.txt

@@ -14,31 +14,36 @@ add_library(
 
 set(
   public_headers
-  header/DeprecationUtils.h
-  header/GeneralUtils.h
-  header/IpAddress.h
-  header/IpAddressUtils.h
-  header/IpUtils.h
-  header/Logger.h
-  header/LRUList.h
-  header/MacAddress.h
-  header/ObjectPool.h
-  header/OUILookup.h
-  header/PcapPlusPlusVersion.h
-  header/PointerVector.h
-  header/SystemUtils.h
-  header/TablePrinter.h
-  header/TimespecTimeval.h
+  header/pcapplusplus/DeprecationUtils.h
+  header/pcapplusplus/GeneralUtils.h
+  header/pcapplusplus/IpAddress.h
+  header/pcapplusplus/IpAddressUtils.h
+  header/pcapplusplus/IpUtils.h
+  header/pcapplusplus/Logger.h
+  header/pcapplusplus/LRUList.h
+  header/pcapplusplus/MacAddress.h
+  header/pcapplusplus/ObjectPool.h
+  header/pcapplusplus/OUILookup.h
+  header/pcapplusplus/PcapPlusPlusVersion.h
+  header/pcapplusplus/PointerVector.h
+  header/pcapplusplus/SystemUtils.h
+  header/pcapplusplus/TablePrinter.h
+  header/pcapplusplus/TimespecTimeval.h
 )
 
 # Set the public header that will be installed
 set_property(TARGET Common++ PROPERTY PUBLIC_HEADER ${public_headers})
 
+set_target_properties(Common++ PROPERTIES PCAPPP_ENABLE_OLD_STYLE_INCLUDE "${PCAPPP_ENABLE_OLD_STYLE_INCLUDE}")
+
 target_compile_features(Common++ PUBLIC cxx_std_11)
 
 target_include_directories(
   Common++
-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header> $<INSTALL_INTERFACE:include/pcapplusplus>
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+    $<INSTALL_INTERFACE:include>
+    $<$<BOOL:$<TARGET_PROPERTY:Common++,PCAPPP_ENABLE_OLD_STYLE_INCLUDE>>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header/pcapplusplus>$<INSTALL_INTERFACE:include/pcapplusplus>>
   # Don't link with EndianPortable and json as it won't be exported
   PRIVATE $<TARGET_PROPERTY:EndianPortable,INTERFACE_INCLUDE_DIRECTORIES>
   PRIVATE $<TARGET_PROPERTY:json,INTERFACE_INCLUDE_DIRECTORIES>

Common++/src/GeneralUtils.cpp

@@ -1,7 +1,7 @@
 #define LOG_MODULE CommonLogModuleGenericUtils
 
-#include "GeneralUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/GeneralUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <sstream>
 #include <iomanip>
 #include <cstring>

Common++/src/IpAddress.cpp

@@ -4,9 +4,9 @@
 #include <sstream>
 #include <stdexcept>
 #include <bitset>
-#include "Logger.h"
-#include "IpUtils.h"
-#include "IpAddress.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/IpAddress.h"
 #include "EndianPortable.h"
 
 // for AF_INET, AF_INET6

Common++/src/IpAddressUtils.cpp

@@ -1,7 +1,7 @@
-#include "IpAddressUtils.h"
+#include "pcapplusplus/IpAddressUtils.h"
 
-#include "IpAddress.h"
-#include "IpUtils.h"  // Just needing in_addr and in6_addr.
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/IpUtils.h"  // Just needing in_addr and in6_addr.
 
 namespace pcpp
 {

Common++/src/IpUtils.cpp

@@ -1,7 +1,7 @@
 #define LOG_MODULE CommonLogModuleIpUtils
 
-#include "IpUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/IpUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <cstring>
 #include <stdexcept>
 #ifndef NS_INADDRSZ

Common++/src/Logger.cpp

@@ -1,4 +1,4 @@
-#include "Logger.h"
+#include "pcapplusplus/Logger.h"
 
 #include <iostream>
 #include <iomanip>

Common++/src/MacAddress.cpp

@@ -1,4 +1,4 @@
-#include "MacAddress.h"
+#include "pcapplusplus/MacAddress.h"
 
 namespace pcpp
 {

Common++/src/OUILookup.cpp

@@ -1,7 +1,7 @@
-#include "OUILookup.h"
-#include "Logger.h"
+#include "pcapplusplus/OUILookup.h"
+#include "pcapplusplus/Logger.h"
 
-#include "json.hpp"
+#include <json.hpp>
 
 #include <fstream>
 

Common++/src/PcapPlusPlusVersion.cpp

@@ -1,4 +1,4 @@
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 
 namespace pcpp
 {

Common++/src/SystemUtils.cpp

@@ -1,4 +1,4 @@
-#include "SystemUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "EndianPortable.h"
 
 #ifndef _MSC_VER

Common++/src/TablePrinter.cpp

@@ -5,8 +5,8 @@
 #include <iostream>
 #include <numeric>
 #include <utility>
-#include "TablePrinter.h"
-#include "Logger.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {

Examples/ArpSpoofing/main.cpp

@@ -1,14 +1,15 @@
 #include <iostream>
 #include <fstream>
-#include "MacAddress.h"
-#include "IpAddress.h"
-#include "PcapPlusPlusVersion.h"
-#include "SystemUtils.h"
-#include "PcapLiveDeviceList.h"
-#include "PcapLiveDevice.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "ArpLayer.h"
+
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/ArpLayer.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \

Examples/Arping/main.cpp

@@ -6,15 +6,15 @@
  */
 
 #include <iostream>
-#include <MacAddress.h>
-#include <IpAddress.h>
-#include <Logger.h>
-#include <PcapPlusPlusVersion.h>
-#include <PcapLiveDeviceList.h>
-#include <PcapLiveDevice.h>
-#include <NetworkUtils.h>
 #include <getopt.h>
-#include <SystemUtils.h>
+#include "pcapplusplus/MacAddress.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/Logger.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/NetworkUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
 	do                                                                                                                 \

Examples/DNSResolver/main.cpp

@@ -1,10 +1,10 @@
 #include <iostream>
-#include "PcapPlusPlusVersion.h"
-#include "PcapLiveDevice.h"
-#include "PcapLiveDeviceList.h"
-#include "NetworkUtils.h"
-#include "SystemUtils.h"
-#include "Logger.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/NetworkUtils.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/Logger.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \

Examples/DnsSpoofing/main.cpp

@@ -16,21 +16,21 @@
 #if !defined(_WIN32)
 #	include <errno.h>
 #endif
-#include "IpAddress.h"
-#include "RawPacket.h"
-#include "ProtocolType.h"
-#include "Packet.h"
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "UdpLayer.h"
-#include "DnsLayer.h"
-#include "PcapFilter.h"
-#include "PcapLiveDevice.h"
-#include "PcapLiveDeviceList.h"
-#include "TablePrinter.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/IpAddress.h"
+#include "pcapplusplus/RawPacket.h"
+#include "pcapplusplus/ProtocolType.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/DnsLayer.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/PcapLiveDevice.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \

Examples/DpdkBridge/AppWorkerThread.h

@@ -2,10 +2,10 @@
 
 #include "Common.h"
 
-#include "PacketUtils.h"
-#include "DpdkDevice.h"
-#include "DpdkDeviceList.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 /**
  * The worker thread class which does all the work. It's initialized with pointers to the RX and TX devices, then it

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>

Examples/DpdkBridge/main.cpp

@@ -23,10 +23,10 @@
 #include "Common.h"
 #include "AppWorkerThread.h"
 
-#include "DpdkDeviceList.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "TablePrinter.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/TablePrinter.h"
 
 #include <vector>
 #include <iostream>

Examples/DpdkExample-FilterTraffic/AppWorkerThread.h

@@ -3,10 +3,10 @@
 #include "Common.h"
 #include "PacketMatchingEngine.h"
 
-#include "PacketUtils.h"
-#include "DpdkDevice.h"
-#include "DpdkDeviceList.h"
-#include "PcapFileDevice.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/DpdkDevice.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 /**
  * The worker thread class which does all the work: receive packets from relevant DPDK port(s), matched them with the

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>

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

Examples/DpdkExample-FilterTraffic/main.cpp

@@ -24,12 +24,12 @@
 #include "PacketMatchingEngine.h"
 #include "AppWorkerThread.h"
 
-#include "DpdkDeviceList.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "TablePrinter.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/UdpLayer.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/TablePrinter.h"
 
 #include <vector>
 #include <iostream>