Dev

README.md

@@ -35,6 +35,3 @@ The entire procedure of adding new protocols in detail:
 If you want to distribute a source tar file of nDPI do:
 
 - make dist
-
---------------------------
-April 2015 - ntop 

README.nDPI

@@ -0,0 +1,20 @@
+rerequisites for Compilation
+-----------------------------
+
+Prerequisites
+- GNU autotools/libtool
+- libpcap or PF_RING (optional but recommended)
+
+On Ubuntu/Debian
+- apt-get install build-essential
+- apt-get install git autoconf automake autogen libpcap-dev libtool
+
+On Fedora/CentOS
+- yum groupinstall "Development tools"
+- yum install git autoconf automake autogen libpcap-devel libtool
+
+On MacOSX (using http://brew.sh)
+brew install autoconf automake libtool git
+
+On FreeBSD
+- pkg install autoconf automake libtool gmake git

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libndpi], [1.5.2])
+AC_INIT([libndpi], [1.6.0])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -12,7 +12,11 @@ AX_PTHREAD
 if test -d ".git"; then :
      GIT_TAG=`git log -1 --format=%h`
      GIT_DATE=`git log -1 --format=%cd`
-     GIT_NUM=`git rev-list HEAD --count`
+     #
+     # On CentOS 6 `git rev-list HEAD --count` does not work
+     # 
+     #
+     GIT_NUM=`git log --pretty=oneline | wc -l`
      GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
      GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
 else

src/lib/ndpi_content_match.c.inc

@@ -75,11 +75,13 @@ static ndpi_network host_protocol_list[] = {
      Skype (Microsoft CDN)
      157.56.0.0/14, 157.60.0.0/16, 157.54.0.0/15
      111.221.64.0 - 111.221.127.255
+     91.190.216.0/21 (AS198015 Skype Communications Sarl)
   */
   { 0x9D380000 /* 157.56.0.0 */, 14, NDPI_PROTOCOL_SKYPE },
   { 0x9D3C0000 /* 157.60.0.0 */, 16, NDPI_PROTOCOL_SKYPE },
   { 0x9D360000 /* 157.54.0.0 */, 15, NDPI_PROTOCOL_SKYPE },
   { 0x6FDD4000 /* 111.221.64.0 */, 18, NDPI_PROTOCOL_SKYPE },
+  { 0x5BBED800 /* 91.190.216.0 */, 21, NDPI_PROTOCOL_SKYPE },
 
   /*
     Google

tests/result/whatsapp_login_call.pcap.out

@@ -0,0 +1,13 @@
+HTTP	11	726	3
+MDNS	8	952	4
+DHCP	10	3420	1
+STUN	689	85660	4
+ICMP	10	700	1
+SSL	8	589	2
+DropBox	4	2176	1
+Apple	127	28102	20
+WhatsApp	182	25154	2
+AppleiTunes	85	28087	2
+Spotify	3	258	1
+H323	70	9464	14
+RTCP	44	7818	2

tests/result/whatsapp_login_chat.pcap.out

@@ -0,0 +1,6 @@
+MDNS	2	202	2
+DHCP	6	2052	1
+DropBox	2	1088	1
+Apple	50	23466	2
+WhatsApp	32	3243	2
+Spotify	1	86	1