Remove ifdef inside cpp

seladb · Oct 5, 2024 · a130aa4 · a130aa4
1 parent 4f3c101
commit a130aa4
Show file tree

Hide file tree

Showing 297 changed files with 1,259 additions and 1,253 deletions.
diff --git a/Common++/CMakeLists.txt b/Common++/CMakeLists.txt
@@ -12,20 +12,20 @@ add_library(
   src/TablePrinter.cpp)
 
 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/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/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})

diff --git a/Common++/header/DeprecationUtils.h → ...++/header/pcapplusplus/DeprecationUtils.h b/Common++/header/DeprecationUtils.h → ...++/header/pcapplusplus/DeprecationUtils.h
diff --git a/Common++/header/GeneralUtils.h → Common++/header/pcapplusplus/GeneralUtils.h b/Common++/header/GeneralUtils.h → Common++/header/pcapplusplus/GeneralUtils.h
diff --git a/Common++/header/IpAddress.h → Common++/header/pcapplusplus/IpAddress.h b/Common++/header/IpAddress.h → Common++/header/pcapplusplus/IpAddress.h
diff --git a/Common++/header/IpAddressUtils.h → ...on++/header/pcapplusplus/IpAddressUtils.h b/Common++/header/IpAddressUtils.h → ...on++/header/pcapplusplus/IpAddressUtils.h
diff --git a/Common++/header/IpUtils.h → Common++/header/pcapplusplus/IpUtils.h b/Common++/header/IpUtils.h → Common++/header/pcapplusplus/IpUtils.h
diff --git a/Common++/header/LRUList.h → Common++/header/pcapplusplus/LRUList.h b/Common++/header/LRUList.h → Common++/header/pcapplusplus/LRUList.h
diff --git a/Common++/header/Logger.h → Common++/header/pcapplusplus/Logger.h b/Common++/header/Logger.h → Common++/header/pcapplusplus/Logger.h
diff --git a/Common++/header/MacAddress.h → Common++/header/pcapplusplus/MacAddress.h b/Common++/header/MacAddress.h → Common++/header/pcapplusplus/MacAddress.h
diff --git a/Common++/header/OUILookup.h → Common++/header/pcapplusplus/OUILookup.h b/Common++/header/OUILookup.h → Common++/header/pcapplusplus/OUILookup.h
diff --git a/Common++/header/PcapPlusPlusVersion.h → ...header/pcapplusplus/PcapPlusPlusVersion.h b/Common++/header/PcapPlusPlusVersion.h → ...header/pcapplusplus/PcapPlusPlusVersion.h
diff --git a/Common++/header/PointerVector.h → Common++/header/pcapplusplus/PointerVector.h b/Common++/header/PointerVector.h → Common++/header/pcapplusplus/PointerVector.h
diff --git a/Common++/header/SystemUtils.h → Common++/header/pcapplusplus/SystemUtils.h b/Common++/header/SystemUtils.h → Common++/header/pcapplusplus/SystemUtils.h
diff --git a/Common++/header/TablePrinter.h → Common++/header/pcapplusplus/TablePrinter.h b/Common++/header/TablePrinter.h → Common++/header/pcapplusplus/TablePrinter.h
diff --git a/Common++/header/TimespecTimeval.h → ...n++/header/pcapplusplus/TimespecTimeval.h b/Common++/header/TimespecTimeval.h → ...n++/header/pcapplusplus/TimespecTimeval.h
diff --git a/Common++/src/GeneralUtils.cpp b/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 <string.h>

diff --git a/Common++/src/IpAddress.cpp b/Common++/src/IpAddress.cpp
@@ -7,9 +7,9 @@
 #include <stdexcept>
 #include <stdint.h>
 #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

diff --git a/Common++/src/IpAddressUtils.cpp b/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
 {

diff --git a/Common++/src/IpUtils.cpp b/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 <string.h>
 #include <stdio.h>
 #include <stdexcept>

diff --git a/Common++/src/Logger.cpp b/Common++/src/Logger.cpp
@@ -1,5 +1,5 @@
 #include <sstream>
-#include "Logger.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {

diff --git a/Common++/src/MacAddress.cpp b/Common++/src/MacAddress.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "MacAddress.h"
+#include "pcapplusplus/MacAddress.h"
 
 namespace pcpp
 {

diff --git a/Common++/src/OUILookup.cpp b/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>
 

diff --git a/Common++/src/PcapPlusPlusVersion.cpp b/Common++/src/PcapPlusPlusVersion.cpp
@@ -1,4 +1,4 @@
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 
 namespace pcpp
 {

diff --git a/Common++/src/SystemUtils.cpp b/Common++/src/SystemUtils.cpp
@@ -1,4 +1,4 @@
-#include "SystemUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "EndianPortable.h"
 
 #ifndef _MSC_VER

diff --git a/Common++/src/TablePrinter.cpp b/Common++/src/TablePrinter.cpp
@@ -6,8 +6,8 @@
 #include <iterator>
 #include <numeric>
 #include <utility>
-#include "TablePrinter.h"
-#include "Logger.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/Logger.h"
 
 namespace pcpp
 {

diff --git a/Examples/ArpSpoofing/main.cpp b/Examples/ArpSpoofing/main.cpp
@@ -3,15 +3,17 @@
 #include <iostream>
 #include <fstream>
 #include <memory>
-#include <MacAddress.h>
-#include <IpAddress.h>
-#include <PcapPlusPlusVersion.h>
-#include <SystemUtils.h>
-#include <PcapLiveDeviceList.h>
-#include <PcapLiveDevice.h>
-#include <EthLayer.h>
-#include <ArpLayer.h>
-#include <Logger.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/EthLayer.h"
+#include "pcapplusplus/ArpLayer.h"
+#include "pcapplusplus/Logger.h"
+
 #include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \

diff --git a/Examples/Arping/main.cpp b/Examples/Arping/main.cpp
@@ -7,15 +7,15 @@
 
 #include <stdlib.h>
 #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                                                                                                                 \

diff --git a/Examples/DNSResolver/main.cpp b/Examples/DNSResolver/main.cpp
@@ -1,11 +1,11 @@
 #include <stdlib.h>
 #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)                                                                                        \

diff --git a/Examples/DnsSpoofing/main.cpp b/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)                                                                                        \

diff --git a/Examples/DpdkBridge/main.cpp b/Examples/DpdkBridge/main.cpp
@@ -23,13 +23,13 @@
 #include "Common.h"
 #include "AppWorkerThread.h"
 
-#include "DpdkDeviceList.h"
-#include "IPv4Layer.h"
-#include "TcpLayer.h"
-#include "UdpLayer.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
-#include "TablePrinter.h"
+#include "pcapplusplus/DpdkDeviceList.h"
+#include "pcapplusplus/IPv4Layer.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>

diff --git a/Examples/DpdkExample-FilterTraffic/main.cpp b/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>

diff --git a/Examples/ExampleApp/main.cpp b/Examples/ExampleApp/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
-#include <IPv4Layer.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/PcapFileDevice.h"
 
 int main(int argc, char* argv[])
 {

diff --git a/Examples/HttpAnalyzer/HttpStatsCollector.h b/Examples/HttpAnalyzer/HttpStatsCollector.h
@@ -4,12 +4,12 @@
 
 #include <functional>
 #include <sstream>
-#include "HttpLayer.h"
-#include "TcpLayer.h"
-#include "IPv4Layer.h"
-#include "PayloadLayer.h"
-#include "PacketUtils.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/HttpLayer.h"
+#include "pcapplusplus/TcpLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PacketUtils.h"
+#include "pcapplusplus/SystemUtils.h"
 
 /**
  * An auxiliary struct for encapsulating rate stats

diff --git a/Examples/HttpAnalyzer/main.cpp b/Examples/HttpAnalyzer/main.cpp
@@ -21,17 +21,18 @@
 #include <string.h>
 #include <iomanip>
 #include <algorithm>
-#include "PcapLiveDeviceList.h"
-#include "PcapFilter.h"
-#include "PcapFileDevice.h"
-#include "HttpStatsCollector.h"
-#include "TablePrinter.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/PcapFilter.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/TablePrinter.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 #include <getopt.h>
 #include <iostream>
 #include <sstream>
 
+#include "HttpStatsCollector.h"
+
 #define EXIT_WITH_ERROR(reason)                                                                                        \
 	do                                                                                                                 \
 	{                                                                                                                  \

diff --git a/Examples/IPDefragUtil/main.cpp b/Examples/IPDefragUtil/main.cpp
@@ -3,13 +3,13 @@
 #include <sstream>
 #include <stdlib.h>
 #include <string.h>
-#include "PcapPlusPlusVersion.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "IPReassembly.h"
-#include "PcapFileDevice.h"
-#include "SystemUtils.h"
-#include "getopt.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/IPReassembly.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
+#include <getopt.h>
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \
 	do                                                                                                                 \

diff --git a/Examples/IPFragUtil/main.cpp b/Examples/IPFragUtil/main.cpp
@@ -4,13 +4,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "PcapPlusPlusVersion.h"
-#include "Packet.h"
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PayloadLayer.h"
-#include "PcapFileDevice.h"
-#include "SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
+#include "pcapplusplus/Packet.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IPv6Layer.h"
+#include "pcapplusplus/PayloadLayer.h"
+#include "pcapplusplus/PcapFileDevice.h"
+#include "pcapplusplus/SystemUtils.h"
 #include "getopt.h"
 
 #define EXIT_WITH_ERROR(reason)                                                                                        \

diff --git a/Examples/IcmpFileTransfer/Common.cpp b/Examples/IcmpFileTransfer/Common.cpp
@@ -3,12 +3,12 @@
 #include <iostream>
 #include <vector>
 #include <getopt.h>
-#include "EthLayer.h"
-#include "IPv4Layer.h"
-#include "IcmpLayer.h"
-#include "PcapLiveDeviceList.h"
-#include "SystemUtils.h"
-#include "PcapPlusPlusVersion.h"
+#include "pcapplusplus/EthLayer.h"
+#include "pcapplusplus/IPv4Layer.h"
+#include "pcapplusplus/IcmpLayer.h"
+#include "pcapplusplus/PcapLiveDeviceList.h"
+#include "pcapplusplus/SystemUtils.h"
+#include "pcapplusplus/PcapPlusPlusVersion.h"
 
 #if defined(_WIN32)
 #	define SEPARATOR '\\'