Upgrade pcapplusplus from 22.11 to 23.09 (#701)

* Upgrade pcapplusplus from 22.11 to 23.09 * Fix macos python version
netboxlabs · Nov 7, 2023 · ab14a07 · ab14a07
1 parent 167a0b1
commit ab14a07
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 85 deletions.
diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -33,6 +33,11 @@ jobs:
         # We'll use this as our working directory for all subsequent commands
         run: cmake -E make_directory ${{github.workspace}}/build
 
+      - name: Python Setup
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
       - name: Get Conan
         id: conan
         uses: turtlebrowser/get-conan@main

diff --git a/conanfile.txt b/conanfile.txt
@@ -9,7 +9,7 @@ libmaxminddb/1.7.1
 nlohmann_json/3.11.2
 openssl/1.1.1w
 opentelemetry-proto/1.0.0
-pcapplusplus/22.11
+pcapplusplus/23.09
 protobuf/3.21.12
 sigslot/1.2.2
 spdlog/1.12.0

diff --git a/libs/visor_dns/DnsLayer.cpp b/libs/visor_dns/DnsLayer.cpp
@@ -2,12 +2,12 @@
 
 #include "DnsLayer.h"
 #include "EndianPortable.h"
-#include <IpAddress.h>
+#include <pcapplusplus/IpAddress.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 #endif
-#include <Logger.h>
+#include <pcapplusplus/Logger.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/libs/visor_dns/DnsLayer.h b/libs/visor_dns/DnsLayer.h
@@ -10,7 +10,7 @@
 #include "DnsLayerEnums.h"
 #include "DnsResource.h"
 #include "DnsResourceData.h"
-#include <UdpLayer.h>
+#include <pcapplusplus/UdpLayer.h>
 #include <VisorTcpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

diff --git a/libs/visor_dns/DnsResource.cpp b/libs/visor_dns/DnsResource.cpp
@@ -7,7 +7,7 @@
 #pragma GCC diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 #endif
-#include <Logger.h>
+#include <pcapplusplus/Logger.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/libs/visor_dns/DnsResourceData.cpp b/libs/visor_dns/DnsResourceData.cpp
@@ -2,14 +2,14 @@
 
 #include "DnsResourceData.h"
 #include "EndianPortable.h"
-#include <GeneralUtils.h>
+#include <pcapplusplus/GeneralUtils.h>
 #include <sstream>
 #include <string.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 #endif
-#include <Logger.h>
+#include <pcapplusplus/Logger.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic ignored "-Wunused-parameter"

diff --git a/libs/visor_dns/DnsResourceData.h b/libs/visor_dns/DnsResourceData.h
@@ -2,7 +2,7 @@
 #define PV_PACKETPP_DNS_RESOURCE_DATA
 
 #include "DnsResource.h"
-#include <IpAddress.h>
+#include <pcapplusplus/IpAddress.h>
 #include <memory>
 #include <string>
 #include <stdint.h>

diff --git a/libs/visor_dns/tests/benchmark_dns.cpp b/libs/visor_dns/tests/benchmark_dns.cpp
@@ -13,9 +13,9 @@
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include "IPv4Layer.h"
-#include "PacketUtils.h"
-#include "PcapFileDevice.h"
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/PacketUtils.h>
+#include <pcapplusplus/PcapFileDevice.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/libs/visor_tcp/VisorTcpLayer.h b/libs/visor_tcp/VisorTcpLayer.h
@@ -18,7 +18,7 @@
 #ifdef TCPOPT_CCECHO
 #undef TCPOPT_CCECHO
 #endif // TCPOPT_CCECHO
-#include <TcpLayer.h>
+#include <pcapplusplus/TcpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
diff --git a/libs/visor_utils/utils.cpp b/libs/visor_utils/utils.cpp
@@ -1,6 +1,6 @@
 #include "utils.h"
 #include "EndianPortable.h"
-#include <IpUtils.h>
+#include <pcapplusplus/IpUtils.h>
 #include <fmt/format.h>
 #include <sstream>
 

diff --git a/libs/visor_utils/utils.h b/libs/visor_utils/utils.h
@@ -15,7 +15,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
-#include <IpAddress.h>
+#include <pcapplusplus/IpAddress.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/handlers/bgp/BgpStreamHandler.cpp b/src/handlers/bgp/BgpStreamHandler.cpp
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "BgpStreamHandler.h"
-#include <TimespecTimeval.h>
+#include <pcapplusplus/TimespecTimeval.h>
 
 namespace visor::handler::bgp {
 

diff --git a/src/handlers/bgp/BgpStreamHandler.h b/src/handlers/bgp/BgpStreamHandler.h
@@ -13,7 +13,7 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include <BgpLayer.h>
+#include <pcapplusplus/BgpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/handlers/dhcp/DhcpStreamHandler.h b/src/handlers/dhcp/DhcpStreamHandler.h
@@ -12,10 +12,10 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include "DhcpLayer.h"
-#include "DhcpV6Layer.h"
-#include "EthLayer.h"
-#include "IPv6Layer.h"
+#include <pcapplusplus/DhcpLayer.h>
+#include <pcapplusplus/DhcpV6Layer.h>
+#include <pcapplusplus/EthLayer.h>
+#include <pcapplusplus/IPv6Layer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/handlers/dns/v1/DnsStreamHandler.cpp b/src/handlers/dns/v1/DnsStreamHandler.cpp
@@ -15,9 +15,9 @@
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include <IPv4Layer.h>
-#include <IPv6Layer.h>
-#include <TimespecTimeval.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/TimespecTimeval.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/handlers/dns/v1/tests/test_dns_layer.cpp b/src/handlers/dns/v1/tests/test_dns_layer.cpp
@@ -14,11 +14,11 @@
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #pragma clang diagnostic ignored "-Wrange-loop-analysis"
 #endif
-#include "DnsLayer.h"
-#include <Packet.h>
-#include <PcapFileDevice.h>
-#include <ProtocolType.h>
-#include <UdpLayer.h>
+#include <pcapplusplus/DnsLayer.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/ProtocolType.h>
+#include <pcapplusplus/UdpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic ignored "-Wold-style-cast"

diff --git a/src/handlers/dns/v2/DnsStreamHandler.cpp b/src/handlers/dns/v2/DnsStreamHandler.cpp
@@ -15,9 +15,9 @@
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include <IPv4Layer.h>
-#include <IPv6Layer.h>
-#include <TimespecTimeval.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/TimespecTimeval.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/handlers/dns/v2/tests/test_dns_layer.cpp b/src/handlers/dns/v2/tests/test_dns_layer.cpp
@@ -14,11 +14,11 @@
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #pragma clang diagnostic ignored "-Wrange-loop-analysis"
 #endif
-#include "DnsLayer.h"
-#include <Packet.h>
-#include <PcapFileDevice.h>
-#include <ProtocolType.h>
-#include <UdpLayer.h>
+#include <pcapplusplus/DnsLayer.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/ProtocolType.h>
+#include <pcapplusplus/UdpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic ignored "-Wold-style-cast"

diff --git a/src/handlers/net/v1/NetStreamHandler.cpp b/src/handlers/net/v1/NetStreamHandler.cpp
@@ -15,10 +15,10 @@
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PacketUtils.h"
-#include "TimespecTimeval.h"
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/PacketUtils.h>
+#include <pcapplusplus/TimespecTimeval.h>
 #include "VisorTcpLayer.h"
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

diff --git a/src/handlers/net/v2/NetStreamHandler.cpp b/src/handlers/net/v2/NetStreamHandler.cpp
@@ -15,10 +15,10 @@
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include "IPv4Layer.h"
-#include "IPv6Layer.h"
-#include "PacketUtils.h"
-#include "TimespecTimeval.h"
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/PacketUtils.h>
+#include <pcapplusplus/TimespecTimeval.h>
 #include "VisorTcpLayer.h"
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

diff --git a/src/handlers/netprobe/NetProbeStreamHandler.h b/src/handlers/netprobe/NetProbeStreamHandler.h
@@ -15,7 +15,7 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include <IcmpLayer.h>
+#include <pcapplusplus/IcmpLayer.h>
 #include <VisorTcpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

diff --git a/src/inputs/dnstap/DnstapInputStream.h b/src/inputs/dnstap/DnstapInputStream.h
@@ -19,7 +19,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include <DnsLayer.h>
+#include <pcapplusplus/DnsLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/inputs/flow/FlowInputStream.cpp b/src/inputs/flow/FlowInputStream.cpp
@@ -12,11 +12,11 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include <IPv4Layer.h>
-#include <IPv6Layer.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
-#include <UdpLayer.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/UdpLayer.h>
 #include <uvw/async.h>
 #include <uvw/loop.h>
 #include <uvw/timer.h>

diff --git a/src/inputs/netprobe/NetProbe.h b/src/inputs/netprobe/NetProbe.h
@@ -10,8 +10,8 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include <IpAddress.h>
-#include <Packet.h>
+#include <pcapplusplus/IpAddress.h>
+#include <pcapplusplus/Packet.h>
 #include <uvw/loop.h>
 #include <uvw/dns.h>
 #ifdef __GNUC__

diff --git a/src/inputs/netprobe/NetProbeInputStream.cpp b/src/inputs/netprobe/NetProbeInputStream.cpp
@@ -14,11 +14,11 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
-#include <IPv4Layer.h>
-#include <IPv6Layer.h>
-#include <Packet.h>
-#include <PcapFileDevice.h>
-#include <UdpLayer.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/UdpLayer.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/inputs/netprobe/NetProbeInputStream.h b/src/inputs/netprobe/NetProbeInputStream.h
@@ -6,7 +6,7 @@
 
 #include "InputStream.h"
 #include "NetProbe.h"
-#include <Packet.h>
+#include <pcapplusplus/Packet.h>
 #include <spdlog/spdlog.h>
 
 namespace uvw {

diff --git a/src/inputs/netprobe/PingProbe.cpp b/src/inputs/netprobe/PingProbe.cpp
@@ -2,8 +2,8 @@
 
 #include "NetProbeException.h"
 #include "ThreadName.h"
-#include <Packet.h>
-#include <TimespecTimeval.h>
+#include <pcapplusplus/Packet.h>
+#include <pcapplusplus/TimespecTimeval.h>
 #include <uvw/idle.h>
 
 namespace visor::input::netprobe {

diff --git a/src/inputs/netprobe/PingProbe.h b/src/inputs/netprobe/PingProbe.h
@@ -26,8 +26,8 @@ typedef int SOCKET;
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include <IcmpLayer.h>
-#include <IpAddress.h>
+#include <pcapplusplus/IcmpLayer.h>
+#include <pcapplusplus/IpAddress.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif

diff --git a/src/inputs/pcap/PcapInputStream.cpp b/src/inputs/pcap/PcapInputStream.cpp
@@ -15,20 +15,20 @@
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wc99-extensions"
 #endif
-#include <DnsLayer.h> // used only for mock generator
-#include <EthLayer.h>
-#include <IPv4Layer.h>
-#include <IPv6Layer.h>
-#include <Logger.h>
-#include <PacketUtils.h>
-#include <PcapFileDevice.h>
-#include <SystemUtils.h>
+#include <pcapplusplus/DnsLayer.h> // used only for mock generator
+#include <pcapplusplus/EthLayer.h>
+#include <pcapplusplus/IPv4Layer.h>
+#include <pcapplusplus/IPv6Layer.h>
+#include <pcapplusplus/Logger.h>
+#include <pcapplusplus/PacketUtils.h>
+#include <pcapplusplus/PcapFileDevice.h>
+#include <pcapplusplus/SystemUtils.h>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
-#include <IpUtils.h>
 #include <assert.h>
 #include <cstdint>
+#include <pcapplusplus/IpUtils.h>
 #include <sstream>
 
 using namespace std::chrono;
@@ -76,7 +76,7 @@ PcapInputStream::PcapInputStream(const std::string &name)
           this,
           _tcp_connection_start_cb,
           _tcp_connection_end_cb,
-          {true, 1, 1000, 50})
+          pcpp::TcpReassemblyConfiguration(true, 1, 1000, 50))
 {
     pcpp::Logger::getInstance().suppressLogs();
 }
@@ -111,7 +111,7 @@ void PcapInputStream::start()
     }
 
     if (config_exists("debug") && config_get<bool>("debug")) {
-        pcpp::Logger::getInstance().setAllModlesToLogLevel(pcpp::Logger::LogLevel::Debug);
+        pcpp::Logger::getInstance().setAllModulesToLogLevel(pcpp::Logger::LogLevel::Debug);
     }
 
     _cur_pcap_source = PcapInputStream::DefaultPcapSource;
@@ -257,7 +257,7 @@ void PcapInputStream::tcp_message_ready(int8_t side, const pcpp::TcpStreamData &
     for (auto &proxy : _event_proxies) {
         dynamic_cast<PcapInputEventProxy *>(proxy.get())->tcp_message_ready_cb(side, tcpData, _packet_dir_cache);
     }
-    if (_lru_list->put(tcpData.getConnectionData().flowKey, tcpData.getConnectionData().endTime, &_deleted_data)){
+    if (_lru_list->put(tcpData.getConnectionData().flowKey, tcpData.getConnectionData().endTime, &_deleted_data)) {
         _lru_overflow.push_back(_deleted_data.first);
     }
 }