From 4048a8c3007d9297114b7cda2ff12b3b9b6a50a3 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Sun, 26 Jan 2025 01:10:30 +0100 Subject: [PATCH] Set minimal required nDPI version to 4.14 (tarball) and 4.13 (git) Signed-off-by: Toni Uhlig --- .github/workflows/build.yml | 18 +++++++++--------- CMakeLists.txt | 4 ++-- README.md | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d5237484..77fab34d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: poll: "-DFORCE_POLL=OFF" upload: true upload_suffix: "" - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "gcc" os: "ubuntu-latest" ndpi_build: "-DBUILD_NDPI=ON" @@ -54,7 +54,7 @@ jobs: poll: "-DFORCE_POLL=OFF" upload: true upload_suffix: "-host-gcrypt" - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "clang" os: "ubuntu-latest" ndpi_build: "-DBUILD_NDPI=ON" @@ -67,7 +67,7 @@ jobs: poll: "-DFORCE_POLL=OFF" upload: true upload_suffix: "-no-zlib" - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "gcc" os: "ubuntu-latest" ndpi_build: "-DBUILD_NDPI=ON" @@ -79,7 +79,7 @@ jobs: coverage: "-DENABLE_COVERAGE=ON" poll: "-DFORCE_POLL=ON" upload: false - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "clang" os: "ubuntu-latest" ndpi_build: "-DBUILD_NDPI=ON" @@ -91,7 +91,7 @@ jobs: coverage: "-DENABLE_COVERAGE=OFF" poll: "-DFORCE_POLL=OFF" upload: false - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "clang-12" os: "ubuntu-20.04" ndpi_build: "-DBUILD_NDPI=ON" @@ -103,7 +103,7 @@ jobs: coverage: "-DENABLE_COVERAGE=OFF" poll: upload: false - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "gcc-10" os: "ubuntu-20.04" ndpi_build: "-DBUILD_NDPI=ON" @@ -115,7 +115,7 @@ jobs: coverage: "-DENABLE_COVERAGE=OFF" poll: "-DFORCE_POLL=ON" upload: false - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "gcc-7" os: "ubuntu-20.04" ndpi_build: "-DBUILD_NDPI=ON" @@ -127,7 +127,7 @@ jobs: coverage: "-DENABLE_COVERAGE=OFF" poll: "-DFORCE_POLL=OFF" upload: false - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" - compiler: "cc" os: "macOS-13" ndpi_build: "-DBUILD_NDPI=OFF" @@ -140,7 +140,7 @@ jobs: coverage: "-DENABLE_COVERAGE=OFF" poll: upload: false - ndpi_min_version: "4.12" + ndpi_min_version: "4.14" steps: - name: Print Matrix diff --git a/CMakeLists.txt b/CMakeLists.txt index 5401c6c0..1bcae37d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,9 +426,9 @@ if(STATIC_LIBNDPI_INSTALLDIR OR BUILD_NDPI) unset(pkgcfg_lib_NDPI_ndpi CACHE) else() if(NOT NDPI_NO_PKGCONFIG) - pkg_check_modules(NDPI REQUIRED libndpi>=4.11.0) + pkg_check_modules(NDPI REQUIRED libndpi>=4.13.0) if(NOT pkgcfg_lib_NDPI_ndpi) - find_package(NDPI "4.11.0" REQUIRED) + find_package(NDPI "4.13.0" REQUIRED) endif() unset(STATIC_LIBNDPI_INC CACHE) diff --git a/README.md b/README.md index 7844b21f..448d0aaf 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this software is not to spy on others, but to detect network anom # Abstract nDPId is a set of daemons and tools to capture, process and classify network traffic. -Its minimal dependencies (besides a half-way modern C library and POSIX threads) are libnDPI (>=4.9.0 or current github dev branch) and libpcap. +Its minimal dependencies (besides a half-way modern C library and POSIX threads) are libnDPI (>=4.13.0 or current github dev branch) and libpcap. The daemon `nDPId` is capable of multithreading for packet processing, but w/o mutexes for performance reasons. Instead, synchronization is achieved by a packet distribution mechanism.