Skip to content

Commit 94eceb1

Browse files
leoparenteclaude
andcommitted
chore: revert all 3rd-party lib upgrades except pcapplusplus
Keep only pcapplusplus 24.09→25.05 upgrade and visor_dns modernization. Revert all other lib version bumps, opentelemetry target rename, and fmt/ranges.h additions to allow isolated testing of pcapplusplus upgrade. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 14f3a86 commit 94eceb1

4 files changed

Lines changed: 14 additions & 16 deletions

File tree

conanfile.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@ class Pktvisor(ConanFile):
77
generators = "CMakeToolchain", "CMakeDeps"
88

99
def requirements(self):
10-
self.requires("catch2/3.14.0")
10+
self.requires("catch2/3.8.0")
1111
self.requires("corrade/2020.06")
12-
self.requires("cpp-httplib/0.39.0")
12+
self.requires("cpp-httplib/0.18.3")
1313
self.requires("docopt.cpp/0.6.3")
1414
self.requires("fast-cpp-csv-parser/cci.20240102")
15-
self.requires("json-schema-validator/2.4.0")
16-
self.requires("libmaxminddb/1.12.2")
15+
self.requires("json-schema-validator/2.3.0")
16+
self.requires("libmaxminddb/1.10.0")
1717
self.requires("nlohmann_json/3.11.3")
18-
self.requires("openssl/3.6.2")
18+
self.requires("openssl/3.3.2")
1919
if self.settings.os != "Windows":
2020
self.requires("libpcap/1.10.5", force=True)
2121
else:
2222
self.requires("npcap/1.70")
23-
self.requires("opentelemetry-cpp/1.24.0")
23+
self.requires("opentelemetry-cpp/1.17.0")
2424
self.requires("pcapplusplus/25.05")
25-
self.requires("protobuf/6.33.5")
26-
self.requires("sigslot/1.2.3")
27-
self.requires("fmt/11.2.0", force=True)
28-
self.requires("spdlog/1.17.0")
25+
self.requires("protobuf/5.27.0")
26+
self.requires("sigslot/1.2.2")
27+
self.requires("fmt/10.2.1", force=True)
28+
self.requires("spdlog/1.15.0")
2929
self.requires("uvw/3.4.0")
30-
self.requires("yaml-cpp/0.9.0")
30+
self.requires("yaml-cpp/0.8.0")
3131
self.requires("robin-hood-hashing/3.11.5")
32-
self.requires("libcurl/8.19.0")
32+
self.requires("libcurl/8.11.1")
3333
if (
3434
"libc" not in self.settings.compiler.fields
3535
or self.settings.compiler.libc != "musl"
@@ -38,7 +38,7 @@ def requirements(self):
3838

3939
def build_requirements(self):
4040
self.tool_requires("corrade/2020.06")
41-
self.tool_requires("protobuf/6.33.5")
41+
self.tool_requires("protobuf/5.27.0")
4242

4343
def layout(self):
4444
cmake_layout(self)

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ target_link_libraries(visor-core
4545
datasketches
4646
rng
4747
timer
48-
opentelemetry-cpp::proto
48+
opentelemetry-cpp::opentelemetry_proto
4949
protobuf::libprotobuf
5050
maxminddb::maxminddb
5151
Corrade::Corrade

src/GeoDB.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "GeoDB.h"
66
#include <cstring>
77
#include <fmt/format.h>
8-
#include <fmt/ranges.h>
98
#include <stdexcept>
109

1110
namespace visor::geo {

src/StreamHandler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "InputEventProxy.h"
1111
#include <ctime>
1212
#include <fmt/ostream.h>
13-
#include <fmt/ranges.h>
1413
#include <nlohmann/json.hpp>
1514
#include <sstream>
1615

0 commit comments

Comments
 (0)