Skip to content
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ set(VISOR_STATIC_PLUGINS)
enable_testing()

message(STATUS "Building pktvisor version ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}${VISOR_PRERELEASE}")

# opentelemetry-cpp 1.26.0 generates proto headers with dllexport_decl=OPENTELEMETRY_PROTO_API; the Conan recipe doesn't propagate the macro. On Windows the proto package is a DLL (consumers must import); elsewhere it expands to nothing.
if(WIN32)
add_compile_definitions("OPENTELEMETRY_PROTO_API=__declspec(dllimport)")
else()
add_compile_definitions(OPENTELEMETRY_PROTO_API=)
endif()

add_subdirectory(3rd)
add_subdirectory(libs)
add_subdirectory(src)
Expand Down
21 changes: 10 additions & 11 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,27 @@ class Pktvisor(ConanFile):
generators = "CMakeToolchain", "CMakeDeps"

def requirements(self):
self.requires("catch2/3.14.0")
self.requires("cpp-httplib/0.18.3")
self.requires("catch2/3.15.1")
self.requires("cpp-httplib/0.27.0")
self.requires("docopt.cpp/0.6.3")
self.requires("fast-cpp-csv-parser/cci.20240102")
self.requires("json-schema-validator/2.4.0")
self.requires("libmaxminddb/1.12.2")
self.requires("nlohmann_json/3.11.3")
self.requires("openssl/3.6.2")
self.requires("nlohmann_json/3.12.0", force=True)
self.requires("openssl/3.6.3")
if self.settings.os != "Windows":
self.requires("libpcap/1.10.5", force=True)
self.requires("libpcap/1.10.6", force=True)
else:
self.requires("npcap/1.70")
self.requires("opentelemetry-cpp/1.24.0")
self.requires("npcap/1.86", force=True)
self.requires("opentelemetry-cpp/1.26.0")
self.requires("pcapplusplus/25.05")
self.requires("protobuf/6.33.5")
self.requires("sigslot/1.2.3")
self.requires("fmt/10.2.1", force=True)
self.requires("spdlog/1.15.0")
self.requires("spdlog/1.17.0")
self.requires("uvw/3.4.0")
self.requires("yaml-cpp/0.8.0")
self.requires("yaml-cpp/0.9.0")
self.requires("robin-hood-hashing/3.11.5")
self.requires("libcurl/8.19.0")
self.requires("libcurl/8.20.0")
if (
"libc" not in self.settings.compiler.fields
or self.settings.compiler.libc != "musl"
Expand Down
1 change: 1 addition & 0 deletions src/GeoDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "GeoDB.h"
#include <cstring>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <stdexcept>

namespace visor::geo {
Expand Down
1 change: 1 addition & 0 deletions src/InputStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "AbstractModule.h"
#include "InputEventProxy.h"
#include "StreamHandler.h"
#include <fmt/ranges.h>

namespace visor {

Expand Down
1 change: 1 addition & 0 deletions src/StreamHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "InputEventProxy.h"
#include <ctime>
#include <fmt/ostream.h>
#include <fmt/ranges.h>
#include <nlohmann/json.hpp>
#include <sstream>

Expand Down
1 change: 1 addition & 0 deletions src/handlers/dns/v1/DnsStreamHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "DnsStreamHandler.h"
#include "HandlerModulePlugin.h"
#include "utils.h"
#include <fmt/ranges.h>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
Expand Down
1 change: 1 addition & 0 deletions src/handlers/dns/v2/DnsStreamHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "DnsStreamHandler.h"
#include "HandlerModulePlugin.h"
#include "utils.h"
#include <fmt/ranges.h>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
Expand Down
1 change: 1 addition & 0 deletions src/inputs/netprobe/NetProbeInputStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "PingProbe.h"
#include "TcpProbe.h"
#include "ThreadName.h"
#include <fmt/ranges.h>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
Expand Down
Loading