aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2024-02-06 10:49:47 +0100
committerToni Uhlig <matzeton@googlemail.com>2024-02-06 10:49:47 +0100
commit556025b34d53c33d389de33a5c8c162e201d2267 (patch)
tree71d769b8c2ae4d16abe70512f3f89a9bd8dd246c
parentfeb2583ef680281c827df75e3c3f6d4b97be8d8f (diff)
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>
-rw-r--r--CMakeLists.txt4
-rw-r--r--README.md2
-rw-r--r--nDPId.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcfa61be3..0ff0b9b9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/README.md b/README.md
index 15cb4b4bf..fa3d4e8f7 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 (>=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.
diff --git a/nDPId.c b/nDPId.c
index e5f74c771..63cd49223 100644
--- a/nDPId.c
+++ b/nDPId.c
@@ -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