diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 52924ca72..4eaa5ffa2 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -490,7 +490,8 @@ jobs: runs-on: ubuntu-latest outputs: runner_token: ${{ steps.token.outputs.runner }} - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' + if: false # This job will never run steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 6a32bcf7d..7e589c0a2 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -176,7 +176,8 @@ jobs: outputs: runner_token: ${{ steps.token.outputs.runner }} runner_label: ${{ env.RUNNER_LABEL }} - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' + if: false # This job will never run steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index f19639481..b75d87b83 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -25,11 +25,11 @@ jobs: cc: x86_64-linux-musl-gcc cxx: x86_64-linux-musl-g++ ldflags: "-static" - - arch: armv7lh # ARMv7 little-endian hard-float - conan_arch: armv7hf - toolchain: http://musl.cc/armv7l-linux-musleabihf-cross.tgz - cc: armv7l-linux-musleabihf-gcc - cxx: armv7l-linux-musleabihf-g++ + # - arch: armv7lh # ARMv7 little-endian hard-float + # conan_arch: armv7hf + # toolchain: http://musl.cc/armv7l-linux-musleabihf-cross.tgz + # cc: armv7l-linux-musleabihf-gcc + # cxx: armv7l-linux-musleabihf-g++ - arch: aarch64 conan_arch: armv8 toolchain: http://musl.cc/aarch64-linux-musl-cross.tgz diff --git a/conanfile.txt b/conanfile.txt index 55d3b7d2b..e7d625ae9 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,29 +1,29 @@ [requires] -catch2/3.5.0 +catch2/3.6.0 corrade/2020.06 -cpp-httplib/0.14.3 +cpp-httplib/0.16.0 docopt.cpp/0.6.3 -fast-cpp-csv-parser/cci.20211104 +fast-cpp-csv-parser/cci.20240102 json-schema-validator/2.3.0 -libmaxminddb/1.8.0 +libmaxminddb/1.10.0 nlohmann_json/3.11.3 -openssl/1.1.1w -opentelemetry-proto/1.0.0 +openssl/3.3.1 +opentelemetry-proto/1.3.0 pcapplusplus/23.09 -protobuf/3.21.12 +abseil/20240116.2 +protobuf/5.27.0 sigslot/1.2.2 -spdlog/1.12.0 -uvw/3.2.0 +spdlog/1.14.1 +uvw/3.4.0 libpcap/1.10.4 yaml-cpp/0.8.0 robin-hood-hashing/3.11.5 -libcurl/8.5.0 +libcurl/8.9.1 crashpad/cci.20220219 -zlib/[>=1.2.10 <1.3] [tool_requires] corrade/2020.06 -protobuf/3.21.12 +protobuf/5.27.0 [options] pcapplusplus:immediate_mode=True diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 56b1238e9..83be04471 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,6 +40,8 @@ target_link_libraries(visor-core rng timer opentelemetry_proto + ${CONAN_LIBS_PROTOBUF} + ${CONAN_LIBS_ABSEIL} ${CONAN_LIBS_LIBMAXMINDDB} ${CONAN_LIBS_CORRADE} ${CONAN_LIBS_SPDLOG} @@ -47,6 +49,7 @@ target_link_libraries(visor-core ${CONAN_LIBS_FAST-CPP-CSV-PARSER} ${CONAN_LIBS_YAML-CPP} ${CONAN_LIBS_OPENSSL} + ${CONAN_LIBS_ZLIB} ${VISOR_STATIC_PLUGINS} ) diff --git a/src/Metrics.h b/src/Metrics.h index d3c716f51..ed101ffd2 100644 --- a/src/Metrics.h +++ b/src/Metrics.h @@ -8,10 +8,13 @@ #include #ifdef __GNUC__ #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" +#pragma GCC diagnostic ignored "-Woverflow" #pragma GCC diagnostic ignored "-Wold-style-cast" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wrange-loop-analysis" +#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" #endif #include #include diff --git a/src/OpenTelemetry.h b/src/OpenTelemetry.h index 73e9e762d..21c6b3e64 100644 --- a/src/OpenTelemetry.h +++ b/src/OpenTelemetry.h @@ -5,9 +5,18 @@ #pragma once #include "HttpServer.h" -#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" #include #include +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" +#pragma GCC diagnostic ignored "-Woverflow" +#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" +#endif +#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif namespace visor { diff --git a/src/handlers/dns/v1/DnsStreamHandler.cpp b/src/handlers/dns/v1/DnsStreamHandler.cpp index 5cc0c0d30..42d250200 100644 --- a/src/handlers/dns/v1/DnsStreamHandler.cpp +++ b/src/handlers/dns/v1/DnsStreamHandler.cpp @@ -3,7 +3,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "DnsStreamHandler.h" -#include "DnstapInputStream.h" #include "HandlerModulePlugin.h" #include "utils.h" #include diff --git a/src/handlers/dns/v1/DnsStreamHandler.h b/src/handlers/dns/v1/DnsStreamHandler.h index da5d7ed56..3f4afa42d 100644 --- a/src/handlers/dns/v1/DnsStreamHandler.h +++ b/src/handlers/dns/v1/DnsStreamHandler.h @@ -5,13 +5,13 @@ #pragma once #include "AbstractMetricsManager.h" +#include "DnstapInputStream.h" #include "GeoDB.h" #include "MockInputStream.h" #include "PcapInputStream.h" #include "StreamHandler.h" #include "TransactionManager.h" #include "dns.h" -#include "pb/dnstap.pb.h" #include #include #include diff --git a/src/handlers/dns/v2/DnsStreamHandler.cpp b/src/handlers/dns/v2/DnsStreamHandler.cpp index 2ad2b7325..5db51a3da 100644 --- a/src/handlers/dns/v2/DnsStreamHandler.cpp +++ b/src/handlers/dns/v2/DnsStreamHandler.cpp @@ -3,7 +3,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "DnsStreamHandler.h" -#include "DnstapInputStream.h" #include "HandlerModulePlugin.h" #include "utils.h" #include diff --git a/src/handlers/dns/v2/DnsStreamHandler.h b/src/handlers/dns/v2/DnsStreamHandler.h index 45a0cb3cd..f90e7a1b7 100644 --- a/src/handlers/dns/v2/DnsStreamHandler.h +++ b/src/handlers/dns/v2/DnsStreamHandler.h @@ -5,13 +5,13 @@ #pragma once #include "AbstractMetricsManager.h" +#include "DnstapInputStream.h" #include "GeoDB.h" #include "MockInputStream.h" #include "PcapInputStream.h" #include "StreamHandler.h" #include "TransactionManager.h" #include "dns.h" -#include "pb/dnstap.pb.h" #include #include #include diff --git a/src/inputs/dnstap/CMakeLists.txt b/src/inputs/dnstap/CMakeLists.txt index 33f3f518f..93d6beb65 100644 --- a/src/inputs/dnstap/CMakeLists.txt +++ b/src/inputs/dnstap/CMakeLists.txt @@ -36,7 +36,6 @@ target_link_libraries(VisorInputDnstap ${DNSTAP_ADDITIONAL_LIBS} Visor::Core Visor::Lib::Utils - ${CONAN_LIBS_PROTOBUF} ${CONAN_LIBS_LIBUV} ${CONAN_LIBS_UVW} ) diff --git a/src/inputs/dnstap/DnstapInputStream.h b/src/inputs/dnstap/DnstapInputStream.h index eec4b674d..d89a24c19 100644 --- a/src/inputs/dnstap/DnstapInputStream.h +++ b/src/inputs/dnstap/DnstapInputStream.h @@ -11,14 +11,16 @@ #include "UnixFrameSession.h" #endif #include "InputStream.h" -#include "pb/dnstap.pb.h" #include "utils.h" #ifdef __GNUC__ #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpedantic" +#pragma GCC diagnostic ignored "-Woverflow" #pragma GCC diagnostic ignored "-Wold-style-cast" #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" #endif +#include "pb/dnstap.pb.h" #include #ifdef __GNUC__ #pragma GCC diagnostic pop