Merge branch 'dev' into dev

lsword · Dec 7, 2017 · cb8f4f8 · cb8f4f8
2 parents 50645e1 + dfd8cbc
commit cb8f4f8
Show file tree

Hide file tree

Showing 35 changed files with 714 additions and 549 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # CHANGELOG
 
+
+#### nDPI 2.2 (December 2017)
+
+## Main New Features
+
+* Custom protocol categories to allow personalization of protocols-categories mappings
+* DHCP fingerprinting
+* HTTP User Agent discovery
+
+
+## New Supported Protocols and Services
+
+* ICQ (instant messaging client)
+* YouTube Upload
+* LISP
+* SoundCloud
+* Sony PlayStation
+* Nintendo (switch) gaming protocol
+
+
+## Improvements
+
+*  Windows 10 detection from UA and indentation
+*  Determine STUN flows that turn into RTP
+*  Fixes for iQIYI and 1kxun
+*  Android fingerprint
+*  Added DHCP class identifier support
+
+------------------------------------------------------------------------
+
 #### nDPI 2.0 (May 2017)
 
 ## Main New Features

diff --git a/autogen.sh b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NDPI_MAJOR="2"
-NDPI_MINOR="1"
+NDPI_MINOR="3"
 NDPI_PATCH="0"
 NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"