ndpi: updated to 3.4

3.4 Stable

New Features

Completely reworked and extended QUIC dissector
Added flow risk concept to move nDPI towards result interpretation
Added ndpi_dpi2json() API call
Added DGA risk for names that look like a DGA
Added HyperLogLog cardinality estimator API calls
Added ndpi_bin_XXX API calls to handle bin handling
Fully fuzzy tested code that has greatly improved reliability and robustness

New Supported Protocols and Services

QUIC
SMBv1
WebSocket
TLS: added ESNI support
SOAP
DNScrypt

Improvements

Python CFFI bindings
Various TLS extensions and fixes including extendede metadata support
Added various pcap files for testing corner cases in protocols
Various improvements in JSON/Binary data serialization
CiscoVPN
H323
MDNS
MySQL 8
IEC 60870-5-104
DoH/DoT dissection improvements
Office365 renamed to Microsoft365
Major protocol dissection improvement in particular with unknwon traffic
Improvement in Telegram v6 protocol support
HTTP improvements to detect file download/upload and binary files
BitTorrent and WhatsApp dissection improvement
Spotify
Added detection of malformed packets
Fuzzy testing support has been greatly improved
SSH code cleanup

Fixes

Fixed various memory leaks and race conditions in protocol decoding
NATS, CAPWAP dissector
Removed HyperScan support that greatly simplified the code
ARM platform fixes on memory alignment
Wireshark extcap support
DPDK support
OpenWRT, OpenBSD support
MINGW compiler support

MISC

Created demo app for nDPI newcomers
Removed obsolete pplive and pando protocols

5 files changed, 23 insertions, 22 deletions

diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index 13989dc78b6..9bbac020179 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/05/25 20:25:22 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/06/23 19:31:49 adam Exp $
 
-DISTNAME=	nDPI-3.2
+DISTNAME=	nDPI-3.4
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ntop/}
diff --git a/net/ndpi/PLIST b/net/ndpi/PLIST
index 8c107bc6872..6b28ab80844 100644
--- a/net/ndpi/PLIST
+++ b/net/ndpi/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2020/05/25 20:25:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/06/23 19:31:49 adam Exp $
 bin/ndpiReader
 include/ndpi/ndpi_api.h
 include/ndpi/ndpi_classify.h
 include/ndpi/ndpi_config.h
 include/ndpi/ndpi_define.h
 include/ndpi/ndpi_includes.h
+include/ndpi/ndpi_includes_OpenBSD.h
 include/ndpi/ndpi_main.h
 include/ndpi/ndpi_protocol_ids.h
 include/ndpi/ndpi_protocols.h
diff --git a/net/ndpi/buildlink3.mk b/net/ndpi/buildlink3.mk
index 7c3f77a0455..18e4b8a7ac5 100644
--- a/net/ndpi/buildlink3.mk
+++ b/net/ndpi/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/05/19 12:09:08 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/06/23 19:31:49 adam Exp $
 
 BUILDLINK_TREE+=	ndpi
 
 .if !defined(NDPI_BUILDLINK3_MK)
 NDPI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ndpi+=	ndpi>=2.8
-BUILDLINK_ABI_DEPENDS.ndpi?=	ndpi>=2.8nb1
+BUILDLINK_API_DEPENDS.ndpi+=	ndpi>=3.4
+BUILDLINK_ABI_DEPENDS.ndpi+=	ndpi>=3.4
 BUILDLINK_PKGSRCDIR.ndpi?=	../../net/ndpi
 
 .include "../../textproc/json-c/buildlink3.mk"
diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo
index b87bc09f6c5..7a3402809cc 100644
--- a/net/ndpi/distinfo
+++ b/net/ndpi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2020/05/25 20:25:22 adam Exp $
+$NetBSD: distinfo,v 1.7 2021/06/23 19:31:49 adam Exp $
 
-SHA1 (nDPI-3.2.tar.gz) = 47ea3ac4a17afba1c7dd54bc8ec7a116031f16ef
-RMD160 (nDPI-3.2.tar.gz) = aaabdaf8b626925b85b880617b55143b9f6a3e8e
-SHA512 (nDPI-3.2.tar.gz) = bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
-Size (nDPI-3.2.tar.gz) = 29586049 bytes
+SHA1 (nDPI-3.4.tar.gz) = 65d216e1cf8c07c836db1740a2b6a7077c92b044
+RMD160 (nDPI-3.4.tar.gz) = 3ceacbecda549950b9436f5a8801a1a2ebdbd336
+SHA512 (nDPI-3.4.tar.gz) = ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
+Size (nDPI-3.4.tar.gz) = 37976087 bytes
 SHA1 (patch-src_include_ndpi__includes.h) = db5da9ca24ecf32fd8c264e193af280814dc74c6
-SHA1 (patch-src_lib_Makefile.in) = 70431a2fb53675d221f1383afa86759a2dfd4bfc
+SHA1 (patch-src_lib_Makefile.in) = 5e7abf75abf4d78af8ed9f1dfe9e755e68b0c0e4
diff --git a/net/ndpi/patches/patch-src_lib_Makefile.in b/net/ndpi/patches/patch-src_lib_Makefile.in
index b931e46c66d..16cd67182e5 100644
--- a/net/ndpi/patches/patch-src_lib_Makefile.in
+++ b/net/ndpi/patches/patch-src_lib_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_lib_Makefile.in,v 1.3 2020/05/25 20:25:22 adam Exp $
+$NetBSD: patch-src_lib_Makefile.in,v 1.4 2021/06/23 19:31:49 adam Exp $
 
 Fix building on Darwin.
 
---- src/lib/Makefile.in.orig	2020-02-20 09:15:44.000000000 +0000
+--- src/lib/Makefile.in.orig	2020-10-19 14:18:25.000000000 +0000
 +++ src/lib/Makefile.in
 @@ -22,8 +22,15 @@ OBJECTS   = $(patsubst protocols/%.c, pr
  HEADERS   = $(wildcard ../include/*.h)
@@ -20,26 +20,26 @@ Fix building on Darwin.
  NDPI_LIBS            = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
  
  ifneq ($(OS),Windows_NT)
-@@ -31,8 +38,7 @@ OS := $(shell uname)
- endif
+@@ -32,8 +39,7 @@ endif
+ BUILD_MINGW    		 = @BUILD_MINGW@
  
  ifeq ($(OS),Darwin)
 -CC=clang
 -SONAME_FLAG=
 +SONAME_FLAG=-install_name $(libdir)/${NDPI_LIB_SHARED}
  else
- SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
- endif
-@@ -48,7 +54,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
+ ifneq ($(BUILD_MINGW),)
+ NDPI_LIB_SHARED_BASE = libndpi
+@@ -54,7 +60,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
  $(NDPI_LIB_SHARED): $(OBJECTS)
- 	$(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS) @ADDITIONAL_LIBS@
+ 	$(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS)
  	ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
 -	ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
 +	ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_SHORT)
  
  %.o: %.c $(HEADERS) Makefile
- 	$(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS)
-@@ -66,6 +72,6 @@ install: $(NDPI_LIBS)
+ 	$(CC) $(CFLAGS) -c $< -o $@
+@@ -78,6 +84,6 @@ install: $(NDPI_LIBS)
  	mkdir -p $(DESTDIR)$(libdir)
  	cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
  	cp -P $(NDPI_LIB_SHARED_BASE) $(DESTDIR)$(libdir)/