diff options
| -rw-r--r-- | .github/workflows/build-centos.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | nDPId.c | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/build-centos.yml b/.github/workflows/build-centos.yml index 1823e26be..dd1f88a0e 100644 --- a/.github/workflows/build-centos.yml +++ b/.github/workflows/build-centos.yml @@ -27,8 +27,8 @@ jobs: sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* yum -y update yum -y install curl gpg - curl 'https://packages.ntop.org/centos-stable/ntop.repo' > /etc/yum.repos.d/ntop.repo - curl 'https://packages.ntop.org/centos-stable/RPM-GPG-KEY-deri' | gpg --import + curl 'https://packages.ntop.org/centos/ntop.repo' > /etc/yum.repos.d/ntop.repo + curl 'https://packages.ntop.org/centos/RPM-GPG-KEY-deri' | gpg --import yum -y install yum-utils dnf-plugins-core epel-release dnf config-manager --set-enabled powertools yum -y update diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec76156bc..b30edc945 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: os: ["ubuntu-latest", "ubuntu-20.04"] ndpid_gcrypt: ["-DNDPI_WITH_GCRYPT=OFF", "-DNDPI_WITH_GCRYPT=ON"] ndpid_zlib: ["-DENABLE_ZLIB=OFF", "-DENABLE_ZLIB=ON"] - ndpi_min_version: ["4.6"] + ndpi_min_version: ["4.8"] include: - compiler: "default-cc" os: "ubuntu-latest" diff --git a/CMakeLists.txt b/CMakeLists.txt index dbd7037b5..01dab5720 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,9 +266,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.6.0) + pkg_check_modules(NDPI REQUIRED libndpi>=4.8.0) if(NOT pkgcfg_lib_NDPI_ndpi) - find_package(NDPI "4.6.0" REQUIRED) + find_package(NDPI "4.8.0" REQUIRED) endif() unset(STATIC_LIBNDPI_INC CACHE) @@ -14,7 +14,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. -It's minimal dependencies (besides a half-way modern c library and POSIX threads) are libnDPI (> 4.4.0 or current github dev branch) and libpcap. +It's minimal dependencies (besides a half-way modern c library and POSIX threads) are libnDPI (>= 4.8.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. @@ -49,8 +49,8 @@ #define DLT_DSA_TAG_EDSA 285 #endif -#if ((NDPI_MAJOR == 4 && NDPI_MINOR < 4) || NDPI_MAJOR < 4) && NDPI_API_VERSION < 6336 -#error "nDPI >= 4.4.0 or API version >= 6336 required" +#if ((NDPI_MAJOR == 4 && NDPI_MINOR < 8) || NDPI_MAJOR < 4) && NDPI_API_VERSION < 7001 +#error "nDPI >= 4.8.0 or API version >= 7001 required" #endif #if nDPId_MAX_READER_THREADS <= 0 @@ -1210,7 +1210,7 @@ static void ndpi_debug_printf(unsigned int proto, ...) { va_list vl; - int written, is_log_err; + int written, is_log_err = 0; char buf[128]; struct nDPId_workflow * const workflow = (struct nDPId_workflow *)ndpi_get_user_data(ndpi_struct); |