Removed API version macro check as it's inconsistent on different platforms.

* set min required nDPI version to 4.9.0

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2024-02-06 10:49:47 +01:00
parent feb2583ef6
commit 556025b34d
3 changed files with 6 additions and 6 deletions

View File

@@ -317,9 +317,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>=5.0.0)
pkg_check_modules(NDPI REQUIRED libndpi>=4.9.0)
if(NOT pkgcfg_lib_NDPI_ndpi)
find_package(NDPI "5.0.0" REQUIRED)
find_package(NDPI "4.9.0" REQUIRED)
endif()
unset(STATIC_LIBNDPI_INC CACHE)

View File

@@ -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 (>=5.0.0 or current github dev branch) and libpcap.
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.
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.

View File

@@ -54,10 +54,10 @@
#define DLT_DSA_TAG_EDSA 285
#endif
#define NDPI_VERSION_CHECK ((NDPI_MAJOR == 5 && NDPI_MINOR < 0) || NDPI_MAJOR < 5)
#define NDPI_VERSION_CHECK ((NDPI_MAJOR == 4 && NDPI_MINOR < 9) || NDPI_MAJOR < 4)
#if NDPI_VERSION_CHECK && NDPI_API_VERSION < 10172
#error "nDPI >= 5.0.0 or API version >= 10172 required"
#if NDPI_VERSION_CHECK
#error "nDPI >= 4.9.0 required"
#endif
#if nDPId_MAX_READER_THREADS <= 0