Issue 118 implementation (risk classification), indentation, and PasteBin&LinkedIn added.

3 files changed, 355 insertions, 306 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 25b1308bd..56dcce032 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -30,249 +30,250 @@
 #define __NDPI_PROTOCOLS_DEFAULT_H__
 
 #define NDPI_DETECTION_SUPPORT_IPV6
-#define NDPI_PROTOCOL_SIZE		 2
+#define NDPI_PROTOCOL_SIZE       2
 
-#define NDPI_PROTOCOL_UNKNOWN		 0
+#define NDPI_PROTOCOL_UNKNOWN        0
 
 #define NDPI_PROTOCOL_NO_MASTER_PROTO      NDPI_PROTOCOL_UNKNOWN
 
-#define NDPI_PROTOCOL_UNKNOWN 	           0
-#define NDPI_PROTOCOL_FTP_CONTROL 	   1 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_MAIL_POP 	           2
-#define NDPI_PROTOCOL_MAIL_SMTP 	   3
-#define NDPI_PROTOCOL_MAIL_IMAP 	   4
-#define NDPI_PROTOCOL_DNS 	 5
-#define NDPI_PROTOCOL_IPP 	 6
-#define NDPI_PROTOCOL_HTTP 	 7
-#define NDPI_PROTOCOL_MDNS 	 8
-#define NDPI_PROTOCOL_NTP 	 9
-#define NDPI_PROTOCOL_NETBIOS 	 10
-#define NDPI_PROTOCOL_NFS 	 11
-#define NDPI_PROTOCOL_SSDP 	 12
-#define NDPI_PROTOCOL_BGP 	 13
-#define NDPI_PROTOCOL_SNMP 	 14
-#define NDPI_PROTOCOL_XDMCP 	 15
-#define NDPI_PROTOCOL_SMB 	 16
-#define NDPI_PROTOCOL_SYSLOG 	 17
-#define NDPI_PROTOCOL_DHCP 	 18
-#define NDPI_PROTOCOL_POSTGRES 	 19
-#define NDPI_PROTOCOL_MYSQL 	 20
-#define NDPI_PROTOCOL_HOTMAIL 	 21
-#define NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK 22
-#define NDPI_PROTOCOL_MAIL_POPS 	   23
-#define NDPI_PROTOCOL_APPLEJUICE 	   24
-#define NDPI_PROTOCOL_DIRECTCONNECT 	   25
-#define NDPI_PROTOCOL_SOCRATES 	           26
-#define NDPI_PROTOCOL_COAP 	           27
-#define NDPI_PROTOCOL_VMWARE 	           28
-#define NDPI_PROTOCOL_MAIL_SMTPS 	   29
-#define NDPI_PROTOCOL_FILETOPIA 	   30
-#define NDPI_PROTOCOL_UBNTAC2 	           31 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
-#define NDPI_PROTOCOL_KONTIKI 	           32
-#define NDPI_PROTOCOL_OPENFT 	           33
-#define NDPI_PROTOCOL_FASTTRACK 	   34
-#define NDPI_PROTOCOL_GNUTELLA 	           35
-#define NDPI_PROTOCOL_EDONKEY 	           36 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_BITTORRENT 	   37
-#define NDPI_PROTOCOL_EPP 	           38
-#define NDPI_CONTENT_AVI 	           39
-#define NDPI_CONTENT_FLASH 	           40
-#define NDPI_CONTENT_OGG 	           41
-#define NDPI_CONTENT_MPEG 	           42
-#define NDPI_CONTENT_QUICKTIME 	           43
-#define NDPI_CONTENT_REALMEDIA 	           44
-#define NDPI_CONTENT_WINDOWSMEDIA 	   45
-#define NDPI_CONTENT_MMS 	           46
-#define NDPI_PROTOCOL_XBOX 	           47
-#define NDPI_PROTOCOL_QQ 	           48
-#define NDPI_PROTOCOL_MOVE 	           49
-#define NDPI_PROTOCOL_RTSP 	           50
-#define NDPI_PROTOCOL_MAIL_IMAPS 	   51
-#define NDPI_PROTOCOL_ICECAST 	 52
-#define NDPI_PROTOCOL_PPLIVE 	 53 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_PPSTREAM 	 54
-#define NDPI_PROTOCOL_ZATTOO 	 55
-#define NDPI_PROTOCOL_SHOUTCAST            56
-#define NDPI_PROTOCOL_SOPCAST 	 57
-#define NDPI_PROTOCOL_TVANTS 	 58
-#define NDPI_PROTOCOL_TVUPLAYER 	   59
-#define NDPI_PROTOCOL_HTTP_DOWNLOAD 	   60
-#define NDPI_PROTOCOL_QQLIVE 	 61
-#define NDPI_PROTOCOL_THUNDER 	 62
-#define NDPI_PROTOCOL_SOULSEEK 	 63
-#define NDPI_PROTOCOL_SSL_NO_CERT 	   64
-#define NDPI_PROTOCOL_IRC 	           65
-#define NDPI_PROTOCOL_AYIYA 	           66
-#define NDPI_PROTOCOL_UNENCRYPTED_JABBER   67
-#define NDPI_PROTOCOL_MSN 	 68
-#define NDPI_PROTOCOL_OSCAR 	 69
-#define NDPI_PROTOCOL_YAHOO 	 70
-#define NDPI_PROTOCOL_BATTLEFIELD 	   71
-#define NDPI_PROTOCOL_QUAKE 	 72
-#define NDPI_PROTOCOL_IP_VRRP 	 73
-#define NDPI_PROTOCOL_STEAM 	 74 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_HALFLIFE2 	   75
-#define NDPI_PROTOCOL_WORLDOFWARCRAFT 	   76
-#define NDPI_PROTOCOL_TELNET 	 77
-#define NDPI_PROTOCOL_STUN 	 78
-#define NDPI_PROTOCOL_IP_IPSEC 	 79
-#define NDPI_PROTOCOL_IP_GRE 	 80
-#define NDPI_PROTOCOL_IP_ICMP 	 81
-#define NDPI_PROTOCOL_IP_IGMP 	 82
-#define NDPI_PROTOCOL_IP_EGP 	 83
-#define NDPI_PROTOCOL_IP_SCTP 	 84
-#define NDPI_PROTOCOL_IP_OSPF 	 85
-#define NDPI_PROTOCOL_IP_IP_IN_IP 	   86
-#define NDPI_PROTOCOL_RTP 	 87
-#define NDPI_PROTOCOL_RDP 	 88
-#define NDPI_PROTOCOL_VNC 	 89
-#define NDPI_PROTOCOL_PCANYWHERE 	   90
-#define NDPI_PROTOCOL_SSL 	 91
-#define NDPI_PROTOCOL_SSH 	 92
-#define NDPI_PROTOCOL_USENET 	 93
-#define NDPI_PROTOCOL_MGCP 	 94
-#define NDPI_PROTOCOL_IAX 	 95
-#define NDPI_PROTOCOL_TFTP 	 96
-#define NDPI_PROTOCOL_AFP 	 97
-#define NDPI_PROTOCOL_STEALTHNET 	   98
-#define NDPI_PROTOCOL_AIMINI 	 99
-#define NDPI_PROTOCOL_SIP 	 100
-#define NDPI_PROTOCOL_TRUPHONE 	 101
-#define NDPI_PROTOCOL_IP_ICMPV6 	   102
-#define NDPI_PROTOCOL_DHCPV6 	 103
-#define NDPI_PROTOCOL_ARMAGETRON 	   104
-#define NDPI_PROTOCOL_CROSSFIRE 	   105
-#define NDPI_PROTOCOL_DOFUS 	 106
-#define NDPI_PROTOCOL_FIESTA 	 107
-#define NDPI_PROTOCOL_FLORENSIA 	   108
-#define NDPI_PROTOCOL_GUILDWARS 	   109
-#define NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC 	 110
-#define NDPI_PROTOCOL_KERBEROS 	 111
-#define NDPI_PROTOCOL_LDAP 	 112
-#define NDPI_PROTOCOL_MAPLESTORY 	   113
-#define NDPI_PROTOCOL_MSSQL_TDS 	   114
-#define NDPI_PROTOCOL_PPTP 	 115
-#define NDPI_PROTOCOL_WARCRAFT3 	   116
-#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU 	   117
-#define NDPI_PROTOCOL_SLACK 	 118
-#define NDPI_PROTOCOL_FACEBOOK 	 119
-#define NDPI_PROTOCOL_TWITTER 	 120
-#define NDPI_PROTOCOL_DROPBOX 	 121
-#define NDPI_PROTOCOL_GMAIL 	 122
-#define NDPI_PROTOCOL_GOOGLE_MAPS 	 123
-#define NDPI_PROTOCOL_YOUTUBE 	 124
-#define NDPI_PROTOCOL_SKYPE 	 125
-#define NDPI_PROTOCOL_GOOGLE 	 126
-#define NDPI_PROTOCOL_DCERPC 	 127
-#define NDPI_PROTOCOL_NETFLOW 	 128
-#define NDPI_PROTOCOL_SFLOW 	 129
-#define NDPI_PROTOCOL_HTTP_CONNECT 	 130
-#define NDPI_PROTOCOL_HTTP_PROXY 	 131
-#define NDPI_PROTOCOL_CITRIX 	         132
-#define NDPI_PROTOCOL_NETFLIX 	         133
-#define NDPI_PROTOCOL_LASTFM 	         134
-#define NDPI_PROTOCOL_WAZE 	         135
-#define NDPI_PROTOCOL_SKYFILE_PREPAID 	 136
-#define NDPI_PROTOCOL_SKYFILE_RUDICS 	 137
-#define NDPI_PROTOCOL_SKYFILE_POSTPAID 	 138
-#define NDPI_PROTOCOL_CITRIX_ONLINE 	 139
-#define NDPI_PROTOCOL_APPLE 	         140
-#define NDPI_PROTOCOL_WEBEX 	         141
-#define NDPI_PROTOCOL_WHATSAPP 	         142
-#define NDPI_PROTOCOL_APPLE_ICLOUD 	 143
-#define NDPI_PROTOCOL_VIBER 	         144
-#define NDPI_PROTOCOL_APPLE_ITUNES 	 145
-#define NDPI_PROTOCOL_RADIUS 	         146
-#define NDPI_PROTOCOL_WINDOWS_UPDATE 	 147
-#define NDPI_PROTOCOL_TEAMVIEWER 	 148 /* xplico.org */
-#define NDPI_PROTOCOL_TUENTI 	         149
-#define NDPI_PROTOCOL_LOTUS_NOTES 	 150
-#define NDPI_PROTOCOL_SAP 	         151
-#define NDPI_PROTOCOL_GTP 	         152
-#define NDPI_PROTOCOL_UPNP 	         153
-#define NDPI_PROTOCOL_LLMNR 	         154
-#define NDPI_PROTOCOL_REMOTE_SCAN 	 155
-#define NDPI_PROTOCOL_SPOTIFY 	         156
-#define NDPI_CONTENT_WEBM 	         157
-#define NDPI_PROTOCOL_H323 	         158 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_OPENVPN 	         159 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_NOE 	         160 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_CISCOVPN 	         161 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_TEAMSPEAK 	 162 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_TOR 	         163 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_SKINNY 	         164 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_RTCP 	         165 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_RSYNC 	         166 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_ORACLE 	         167 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_CORBA 	         168 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_UBUNTUONE 	 169 /* Remy Mudingay <mudingay@ill.fr> */
-#define NDPI_PROTOCOL_WHOIS_DAS 	 170
-#define NDPI_PROTOCOL_COLLECTD 	         171
-#define NDPI_PROTOCOL_SOCKS 	         172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_UNKNOWN               0
+#define NDPI_PROTOCOL_FTP_CONTROL           1 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_MAIL_POP              2
+#define NDPI_PROTOCOL_MAIL_SMTP             3
+#define NDPI_PROTOCOL_MAIL_IMAP             4
+#define NDPI_PROTOCOL_DNS                   5
+#define NDPI_PROTOCOL_IPP                   6
+#define NDPI_PROTOCOL_HTTP                  7
+#define NDPI_PROTOCOL_MDNS                  8
+#define NDPI_PROTOCOL_NTP                   9
+#define NDPI_PROTOCOL_NETBIOS               10
+#define NDPI_PROTOCOL_NFS                   11
+#define NDPI_PROTOCOL_SSDP                  12
+#define NDPI_PROTOCOL_BGP                   13
+#define NDPI_PROTOCOL_SNMP                  14
+#define NDPI_PROTOCOL_XDMCP                 15
+#define NDPI_PROTOCOL_SMB                   16
+#define NDPI_PROTOCOL_SYSLOG                17
+#define NDPI_PROTOCOL_DHCP                  18
+#define NDPI_PROTOCOL_POSTGRES              19
+#define NDPI_PROTOCOL_MYSQL                 20
+#define NDPI_PROTOCOL_HOTMAIL               21
+#define NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK  22
+#define NDPI_PROTOCOL_MAIL_POPS             23
+#define NDPI_PROTOCOL_APPLEJUICE            24
+#define NDPI_PROTOCOL_DIRECTCONNECT         25
+#define NDPI_PROTOCOL_SOCRATES              26
+#define NDPI_PROTOCOL_COAP                  27
+#define NDPI_PROTOCOL_VMWARE                28
+#define NDPI_PROTOCOL_MAIL_SMTPS            29
+#define NDPI_PROTOCOL_FILETOPIA             30
+#define NDPI_PROTOCOL_UBNTAC2               31 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
+#define NDPI_PROTOCOL_KONTIKI               32
+#define NDPI_PROTOCOL_OPENFT                33
+#define NDPI_PROTOCOL_FASTTRACK             34
+#define NDPI_PROTOCOL_GNUTELLA              35
+#define NDPI_PROTOCOL_EDONKEY               36 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_BITTORRENT            37
+#define NDPI_PROTOCOL_EPP                   38
+#define NDPI_CONTENT_AVI                    39
+#define NDPI_CONTENT_FLASH                  40
+#define NDPI_CONTENT_OGG                    41
+#define NDPI_CONTENT_MPEG                   42
+#define NDPI_CONTENT_QUICKTIME              43
+#define NDPI_CONTENT_REALMEDIA              44
+#define NDPI_CONTENT_WINDOWSMEDIA           45
+#define NDPI_CONTENT_MMS                    46
+#define NDPI_PROTOCOL_XBOX                  47
+#define NDPI_PROTOCOL_QQ                    48
+#define NDPI_PROTOCOL_MOVE                  49
+#define NDPI_PROTOCOL_RTSP                  50
+#define NDPI_PROTOCOL_MAIL_IMAPS            51
+#define NDPI_PROTOCOL_ICECAST               52
+#define NDPI_PROTOCOL_PPLIVE                53 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_PPSTREAM              54
+#define NDPI_PROTOCOL_ZATTOO                55
+#define NDPI_PROTOCOL_SHOUTCAST             56
+#define NDPI_PROTOCOL_SOPCAST               57
+#define NDPI_PROTOCOL_TVANTS                58
+#define NDPI_PROTOCOL_TVUPLAYER             59
+#define NDPI_PROTOCOL_HTTP_DOWNLOAD         60
+#define NDPI_PROTOCOL_QQLIVE                61
+#define NDPI_PROTOCOL_THUNDER               62
+#define NDPI_PROTOCOL_SOULSEEK              63
+#define NDPI_PROTOCOL_SSL_NO_CERT           64
+#define NDPI_PROTOCOL_IRC                   65
+#define NDPI_PROTOCOL_AYIYA                 66
+#define NDPI_PROTOCOL_UNENCRYPTED_JABBER    67
+#define NDPI_PROTOCOL_MSN                   68
+#define NDPI_PROTOCOL_OSCAR                 69
+#define NDPI_PROTOCOL_YAHOO                 70
+#define NDPI_PROTOCOL_BATTLEFIELD           71
+#define NDPI_PROTOCOL_QUAKE                 72
+#define NDPI_PROTOCOL_IP_VRRP               73
+#define NDPI_PROTOCOL_STEAM                 74 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_HALFLIFE2             75
+#define NDPI_PROTOCOL_WORLDOFWARCRAFT       76
+#define NDPI_PROTOCOL_TELNET                77
+#define NDPI_PROTOCOL_STUN                  78
+#define NDPI_PROTOCOL_IP_IPSEC              79
+#define NDPI_PROTOCOL_IP_GRE                80
+#define NDPI_PROTOCOL_IP_ICMP               81
+#define NDPI_PROTOCOL_IP_IGMP               82
+#define NDPI_PROTOCOL_IP_EGP                83
+#define NDPI_PROTOCOL_IP_SCTP               84
+#define NDPI_PROTOCOL_IP_OSPF               85
+#define NDPI_PROTOCOL_IP_IP_IN_IP           86
+#define NDPI_PROTOCOL_RTP                   87
+#define NDPI_PROTOCOL_RDP                   88
+#define NDPI_PROTOCOL_VNC                   89
+#define NDPI_PROTOCOL_PCANYWHERE            90
+#define NDPI_PROTOCOL_SSL                   91
+#define NDPI_PROTOCOL_SSH                   92
+#define NDPI_PROTOCOL_USENET                93
+#define NDPI_PROTOCOL_MGCP                  94
+#define NDPI_PROTOCOL_IAX                   95
+#define NDPI_PROTOCOL_TFTP                  96
+#define NDPI_PROTOCOL_AFP                   97
+#define NDPI_PROTOCOL_STEALTHNET            98
+#define NDPI_PROTOCOL_AIMINI                99
+#define NDPI_PROTOCOL_SIP                   100
+#define NDPI_PROTOCOL_TRUPHONE              101
+#define NDPI_PROTOCOL_IP_ICMPV6             102
+#define NDPI_PROTOCOL_DHCPV6                103
+#define NDPI_PROTOCOL_ARMAGETRON            104
+#define NDPI_PROTOCOL_CROSSFIRE             105
+#define NDPI_PROTOCOL_DOFUS                 106
+#define NDPI_PROTOCOL_FIESTA                107
+#define NDPI_PROTOCOL_FLORENSIA             108
+#define NDPI_PROTOCOL_GUILDWARS             109
+#define NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC    110 /*avoid large declarations in the future*/
+#define NDPI_PROTOCOL_KERBEROS              111
+#define NDPI_PROTOCOL_LDAP                  112
+#define NDPI_PROTOCOL_MAPLESTORY            113
+#define NDPI_PROTOCOL_MSSQL_TDS             114
+#define NDPI_PROTOCOL_PPTP                  115
+#define NDPI_PROTOCOL_WARCRAFT3             116
+#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU      117
+#define NDPI_PROTOCOL_SLACK                 118
+#define NDPI_PROTOCOL_FACEBOOK              119
+#define NDPI_PROTOCOL_TWITTER               120
+#define NDPI_PROTOCOL_DROPBOX               121
+#define NDPI_PROTOCOL_GMAIL                 122
+#define NDPI_PROTOCOL_GOOGLE_MAPS           123
+#define NDPI_PROTOCOL_YOUTUBE               124
+#define NDPI_PROTOCOL_SKYPE                 125
+#define NDPI_PROTOCOL_GOOGLE                126
+#define NDPI_PROTOCOL_DCERPC                127
+#define NDPI_PROTOCOL_NETFLOW               128
+#define NDPI_PROTOCOL_SFLOW                 129
+#define NDPI_PROTOCOL_HTTP_CONNECT          130
+#define NDPI_PROTOCOL_HTTP_PROXY            131
+#define NDPI_PROTOCOL_CITRIX                132
+#define NDPI_PROTOCOL_NETFLIX               133
+#define NDPI_PROTOCOL_LASTFM                134
+#define NDPI_PROTOCOL_WAZE                  135
+#define NDPI_PROTOCOL_SKYFILE_PREPAID       136
+#define NDPI_PROTOCOL_SKYFILE_RUDICS        137
+#define NDPI_PROTOCOL_SKYFILE_POSTPAID      138
+#define NDPI_PROTOCOL_CITRIX_ONLINE         139
+#define NDPI_PROTOCOL_APPLE                 140
+#define NDPI_PROTOCOL_WEBEX                 141
+#define NDPI_PROTOCOL_WHATSAPP              142
+#define NDPI_PROTOCOL_APPLE_ICLOUD          143
+#define NDPI_PROTOCOL_VIBER                 144
+#define NDPI_PROTOCOL_APPLE_ITUNES          145
+#define NDPI_PROTOCOL_RADIUS                146
+#define NDPI_PROTOCOL_WINDOWS_UPDATE        147
+#define NDPI_PROTOCOL_TEAMVIEWER            148 /* xplico.org */
+#define NDPI_PROTOCOL_TUENTI                149
+#define NDPI_PROTOCOL_LOTUS_NOTES           150
+#define NDPI_PROTOCOL_SAP                   151
+#define NDPI_PROTOCOL_GTP                   152
+#define NDPI_PROTOCOL_UPNP                  153
+#define NDPI_PROTOCOL_LLMNR                 154
+#define NDPI_PROTOCOL_REMOTE_SCAN           155
+#define NDPI_PROTOCOL_SPOTIFY               156
+#define NDPI_CONTENT_WEBM                   157
+#define NDPI_PROTOCOL_H323                  158 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_OPENVPN               159 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_NOE                   160 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_CISCOVPN              161 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_TEAMSPEAK             162 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_TOR                   163 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_SKINNY                164 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_RTCP                  165 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_RSYNC                 166 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_ORACLE                167 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_CORBA                 168 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_UBUNTUONE             169 /* Remy Mudingay <mudingay@ill.fr> */
+#define NDPI_PROTOCOL_WHOIS_DAS             170
+#define NDPI_PROTOCOL_COLLECTD              171
+#define NDPI_PROTOCOL_SOCKS                 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
 /* The Lync protocol is now skype for business and this the old id 173 can now be recycled */
-#define NDPI_PROTOCOL_NINTENDO		 173
-#define NDPI_PROTOCOL_RTMP 	         174 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_FTP_DATA 	         175 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_WIKIPEDIA 	 176 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_ZMQ 	         177
-#define NDPI_PROTOCOL_AMAZON 	         178 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_EBAY 	         179 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_CNN 	         180 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_MEGACO 	         181 /* Gianluca Costa <g.costa@xplico.org> */
-#define NDPI_PROTOCOL_REDIS 	         182
-#define NDPI_PROTOCOL_PANDO 	         183 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_VHUA 	         184
-#define NDPI_PROTOCOL_TELEGRAM 	         185 /* Gianluca Costa <g.costa@xplico.org> */
-#define NDPI_PROTOCOL_VEVO 	         186
-#define NDPI_PROTOCOL_PANDORA 	         187
-#define NDPI_PROTOCOL_QUIC 	         188 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
-#define NDPI_PROTOCOL_WHATSAPP_VOICE 	 189
-#define NDPI_PROTOCOL_EAQ 	         190
-#define NDPI_PROTOCOL_OOKLA              191
-#define NDPI_PROTOCOL_AMQP               192
-#define NDPI_PROTOCOL_KAKAOTALK 	 193 /* KakaoTalk Chat (no voice call) */
-#define NDPI_PROTOCOL_KAKAOTALK_VOICE 	 194 /* KakaoTalk Voice */
-#define NDPI_PROTOCOL_TWITCH 	         195 /* Edoardo Dominici <edoaramis@gmail.com> */
-#define NDPI_PROTOCOL_QUICKPLAY 	 196 /* Streaming service used by various services such as hooq.tv */
-#define NDPI_PROTOCOL_WECHAT             197
-
-#define NDPI_PROTOCOL_MPEGTS 	         198
-#define NDPI_PROTOCOL_SNAPCHAT 	         199
-#define NDPI_PROTOCOL_SINA 	         200
-#define NDPI_PROTOCOL_HANGOUT 	         201
-#define NDPI_PROTOCOL_IFLIX 	         202 /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
-#define NDPI_PROTOCOL_GITHUB 	         203
-#define NDPI_PROTOCOL_BJNP 	         204
-#define NDPI_PROTOCOL_1KXUN 	         205
-#define NDPI_PROTOCOL_IQIYI 	         206
-#define NDPI_PROTOCOL_SMPP 	         207 /* Damir Franusic <df@release14.org> */
-#define NDPI_PROTOCOL_DNSCRYPT           208
-#define NDPI_PROTOCOL_TINC	         209 /* William Guglielmo <william@deselmo.com> */
-#define NDPI_PROTOCOL_DEEZER 	         210
-#define NDPI_PROTOCOL_INSTAGRAM 	 211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
-#define NDPI_PROTOCOL_MICROSOFT 	 212
-#define NDPI_PROTOCOL_STARCRAFT 	 213 /* Matteo Bracci <matteobracci1@gmail.com> */
-#define NDPI_PROTOCOL_TEREDO 	         214
-#define NDPI_PROTOCOL_HOTSPOT_SHIELD 	 215
-#define NDPI_PROTOCOL_HEP 	         216 /* sipcapture.org QXIP BV */
-#define NDPI_PROTOCOL_GOOGLE_DRIVE       217
-#define NDPI_PROTOCOL_OCS 	         218
-#define NDPI_PROTOCOL_OFFICE_365 	 219
-#define NDPI_PROTOCOL_CLOUDFLARE 	 220
-#define NDPI_PROTOCOL_MS_ONE_DRIVE 	 221
-#define NDPI_PROTOCOL_MQTT 	         222
-#define NDPI_PROTOCOL_RX 	         223
-#define NDPI_PROTOCOL_APPLESTORE         224
-#define NDPI_PROTOCOL_OPENDNS 	         225
-#define NDPI_PROTOCOL_GIT 	         226
-#define NDPI_PROTOCOL_DRDA 	         227
-#define NDPI_PROTOCOL_PLAYSTORE          228 /* Google Play Store */
-#define NDPI_PROTOCOL_SOMEIP		 229
-#define NDPI_PROTOCOL_FIX		 230
-#define NDPI_PROTOCOL_PLAYSTATION        231 /* Sony PlayStation */
+#define NDPI_PROTOCOL_NINTENDO              173
+#define NDPI_PROTOCOL_RTMP                  174 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_FTP_DATA              175 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_WIKIPEDIA             176 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_ZMQ                   177
+#define NDPI_PROTOCOL_AMAZON                178 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_EBAY                  179 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_CNN                   180 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_MEGACO                181 /* Gianluca Costa <g.costa@xplico.org> */
+#define NDPI_PROTOCOL_REDIS                 182
+#define NDPI_PROTOCOL_PANDO                 183 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_VHUA                  184
+#define NDPI_PROTOCOL_TELEGRAM              185 /* Gianluca Costa <g.costa@xplico.org> */
+#define NDPI_PROTOCOL_VEVO                  186
+#define NDPI_PROTOCOL_PANDORA               187
+#define NDPI_PROTOCOL_QUIC                  188 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
+#define NDPI_PROTOCOL_WHATSAPP_VOICE        189
+#define NDPI_PROTOCOL_EAQ                   190
+#define NDPI_PROTOCOL_OOKLA                 191
+#define NDPI_PROTOCOL_AMQP                  192
+#define NDPI_PROTOCOL_KAKAOTALK             193 /* KakaoTalk Chat (no voice call) */
+#define NDPI_PROTOCOL_KAKAOTALK_VOICE       194 /* KakaoTalk Voice */
+#define NDPI_PROTOCOL_TWITCH                195 /* Edoardo Dominici <edoaramis@gmail.com> */
+#define NDPI_PROTOCOL_QUICKPLAY             196 /* Streaming service used by various services such as hooq.tv */
+#define NDPI_PROTOCOL_WECHAT                197
+#define NDPI_PROTOCOL_MPEGTS                198
+#define NDPI_PROTOCOL_SNAPCHAT              199
+#define NDPI_PROTOCOL_SINA                  200
+#define NDPI_PROTOCOL_HANGOUT               201
+#define NDPI_PROTOCOL_IFLIX                 202 /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
+#define NDPI_PROTOCOL_GITHUB                203
+#define NDPI_PROTOCOL_BJNP                  204
+#define NDPI_PROTOCOL_1KXUN                 205
+#define NDPI_PROTOCOL_IQIYI                 206
+#define NDPI_PROTOCOL_SMPP                  207 /* Damir Franusic <df@release14.org> */
+#define NDPI_PROTOCOL_DNSCRYPT              208
+#define NDPI_PROTOCOL_TINC                  209 /* William Guglielmo <william@deselmo.com> */
+#define NDPI_PROTOCOL_DEEZER                210
+#define NDPI_PROTOCOL_INSTAGRAM             211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
+#define NDPI_PROTOCOL_MICROSOFT             212
+#define NDPI_PROTOCOL_STARCRAFT             213 /* Matteo Bracci <matteobracci1@gmail.com> */
+#define NDPI_PROTOCOL_TEREDO                214
+#define NDPI_PROTOCOL_HOTSPOT_SHIELD        215
+#define NDPI_PROTOCOL_HEP                   216 /* sipcapture.org QXIP BV */
+#define NDPI_PROTOCOL_GOOGLE_DRIVE          217
+#define NDPI_PROTOCOL_OCS                   218
+#define NDPI_PROTOCOL_OFFICE_365            219
+#define NDPI_PROTOCOL_CLOUDFLARE            220
+#define NDPI_PROTOCOL_MS_ONE_DRIVE          221
+#define NDPI_PROTOCOL_MQTT                  222
+#define NDPI_PROTOCOL_RX                    223
+#define NDPI_PROTOCOL_APPLESTORE            224
+#define NDPI_PROTOCOL_OPENDNS               225
+#define NDPI_PROTOCOL_GIT                   226
+#define NDPI_PROTOCOL_DRDA                  227
+#define NDPI_PROTOCOL_PLAYSTORE             228 /* Google Play Store */
+#define NDPI_PROTOCOL_SOMEIP                229
+#define NDPI_PROTOCOL_FIX                   230
+#define NDPI_PROTOCOL_PLAYSTATION           231 /* Sony PlayStation */
+#define NDPI_PROTOCOL_PASTEBIN              232 /* Paulo Angelo <pa@pauloangelo.com> */
+#define NDPI_PROTOCOL_LINKEDIN              233 /* Paulo Angelo <pa@pauloangelo.com> */
 
 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
-#define NDPI_LAST_IMPLEMENTED_PROTOCOL		        NDPI_PROTOCOL_PLAYSTATION
+#define NDPI_LAST_IMPLEMENTED_PROTOCOL              NDPI_PROTOCOL_LINKEDIN
 
 #define NDPI_MAX_SUPPORTED_PROTOCOLS                    (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
 #define NDPI_MAX_NUM_CUSTOM_PROTOCOLS                   (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index acb58fcb4..9934039d4 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -758,7 +758,7 @@ typedef enum {
   NDPI_PROTOCOL_CATEGORY_REMOTE_ACCESS,     /* Remote access and control */
   NDPI_PROTOCOL_CATEGORY_CLOUD,             /* Online cloud services */
   NDPI_PROTOCOL_CATEGORY_NETWORK,           /* Network infrastructure protocols */
-  NDPI_PROTOCOL_CATEGORY_COLLABORATIVE,     /* Software for collaborative development */
+  NDPI_PROTOCOL_CATEGORY_COLLABORATIVE,     /* Software for collaborative development, including Webmail */
   NDPI_PROTOCOL_CATEGORY_RPC,               /* High level network communication protocols */
   NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL,      /* Network administration and monitor protocols */
   NDPI_PROTOCOL_CATEGORY_SYSTEM,            /* System level applications */
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index f71de966e..f3334001f 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -7971,43 +7971,84 @@ static ndpi_network host_protocol_list[] = {
 
   HTTP:  Server: field
   HTTPS: Server certificate name
+
+  Risk classification criteria
+  ----------------------------
+
+  NDPI_PROTOCOL_SAFE
+    - Web sites (and CDNs) which are not commonly used to host malicious activities.
+    - OS update hosts.
+    - App stores.
+
+  NDPI_PROTOCOL_ACCEPTABLE
+    - Cloud services may be used to host malware (e.g., https://www.fireeye.com/blog/threat-research/2015/11/china-based-threat.html),
+      but it is mostly used for normal purposes.
+    - Webmail sites, which can be used to phising.
+    - Encrypted administrative protocols, such as SSH.
+    - Text, voice or video communication (e.g., Skype, Slack, Whatsapp).
+    - Ads services are commonly used to spread malware
+      (https://www.tripwire.com/state-of-security/security-data-protection/crypto-ransomware-spreads-via-poisoned-ads-on-major-websites/)
+
+  NDPI_PROTOCOL_FUN
+    - Social media sites and services.
+    - Communication used for fun purposes, like Snapchat, Tinder, etc.
+    - Audio and videostreamming services (e.g., Netflix).
+    - Game services.
+
+  NDPI_PROTOCOL_UNSAFE
+    - Unencrypted administrative protocols, such as Telnet.
+    - Cloud hosted servers when accessed by default domains, such as *.amazonaws.com.
+        - "AWS Supports 41% of Malware Hosting Sites, More than Any Other Web Host or ISP"
+          http://www.thewhir.com/web-hosting-news/aws-supports-41-malware-hosting-sites-web-host-isp
+        - https://www.scmagazine.com/600-plus-cloud-repositories-spotted-hosting-malware-and-malicious-files/article/572205/
+        - https://howtoremove.guide/remove-s3-amazonaws-virus/
+    - Torrents.
+
+  NDPI_PROTOCOL_POTENTIALLY_DANGEROUS
+    - Tor and other anonymization access.
+    - Sites commonly used to host malware and not as commonly used by "normal" users. (e.g., pastebin.com)
+      https://isc.sans.edu/forums/diary/Many+Malware+Samples+Found+on+Pastebin/22036/
+
+  NDPI_PROTOCOL_UNRATED
+    - Avoid this class.
+
 */
 
 ndpi_protocol_match host_match[] = {
-  { "amazon.",                  "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "amazon.com",               "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { "amazon.",                  "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { "amazon.com",               "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { "images-amazon.com",        "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "amazonaws.com",            "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { "amazonaws.com",            "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_UNSAFE },
   { "amazon-adsystem.com",      "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { ".cloudfront.net",          "Amazon",           NDPI_PROTOCOL_AMAZON, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".apple.com",               "Apple",            NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".mzstatic.com",            "Apple",            NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".aaplimg.com",             "Apple",            NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".apple.com",               "Apple",            NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".mzstatic.com",            "Apple",            NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".aaplimg.com",             "Apple",            NDPI_PROTOCOL_APPLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { ".icloud.com",              "AppleiCloud",      NDPI_PROTOCOL_APPLE_ICLOUD, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "iosapps.itunes.apple.com", "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE }, /* iOS */
-  { "osxapps.itunes.apple.com", "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE }, /* MacOS */
-  { "buy.itunes.apple.com",     "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "su.itunes.apple.com",      "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "se.itunes.apple.com",      "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "myapp.itunes.apple.com",   "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "swscan.apple.com",         "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "itunes-apple.com",         "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "iosapps.itunes.apple.com", "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE }, /* iOS */
+  { "osxapps.itunes.apple.com", "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE }, /* MacOS */
+  { "buy.itunes.apple.com",     "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { "su.itunes.apple.com",      "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { "se.itunes.apple.com",      "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { "myapp.itunes.apple.com",   "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { "swscan.apple.com",         "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { "itunes-apple.com",         "AppleStore",       NDPI_PROTOCOL_APPLESTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
   { "itunes.apple.com",         "AppleiTunes",      NDPI_PROTOCOL_APPLE_ITUNES, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_FUN },
 
-  { ".cnn.c",                   "CNN",              NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_FUN },
-  { ".cnn.net",                 "CNN",              NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_FUN },
+  { ".cnn.c",                   "CNN",              NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".cnn.net",                 "CNN",              NDPI_PROTOCOL_CNN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
 
-  { ".dropbox.com",             "DropBox",          NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE },
-  { "log.getdropbox.com",       "DropBox",          NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE },
+  { ".dropbox.com",             "DropBox",          NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
+  { "log.getdropbox.com",       "DropBox",          NDPI_PROTOCOL_DROPBOX, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".ebay.",                   "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".ebay.com",                "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".ebaystatic.com",          "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".ebaydesc.com",            "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".ebayrtm.com",             "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".ebaystratus.com",         "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".ebayimg.com",             "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".ebay.",                   "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /* or FUN */
+  { ".ebay.com",                "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".ebaystatic.com",          "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".ebaydesc.com",            "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".ebayrtm.com",             "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".ebaystratus.com",         "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".ebayimg.com",             "eBay",             NDPI_PROTOCOL_EBAY, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
 
   { "facebook.com",             "Facebook",         NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
   { "fbstatic-a.akamaihd.net",  "Facebook",         NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
@@ -8015,44 +8056,44 @@ ndpi_protocol_match host_match[] = {
   { "fbcdn-",                   "Facebook",         NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
   { ".facebook.net",            "Facebook",         NDPI_PROTOCOL_FACEBOOK, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
 
-  { ".speedtest.net",           "Ookla",            NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".speedtest.net",           "Ookla",            NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_SAFE },
 
-  { "drive-thirdparty.",        "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_SAFE },
-  { "docs.",                    "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_SAFE },
-  { ".docs.",                   "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_SAFE },
-  { "drive.",                   "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, NDPI_PROTOCOL_SAFE },
+  { "drive-thirdparty.",        "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "docs.",                    "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".docs.",                   "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "drive.",                   "GoogleDrive",      NDPI_PROTOCOL_GOOGLE_DRIVE, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { "android.clients.google.com",   "PlayStore",    NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "ggpht.com",                    "PlayStore",    NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "android.clients.google.com",   "PlayStore",    NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { "ggpht.com",                    "PlayStore",    NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
 
-  { "google.",                  "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".google.",                 "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".gstatic.com",             "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".googlesyndication.com",   "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { "google.",                  "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".google.",                 "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".gstatic.com",             "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".googlesyndication.com",   "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { ".googletagservices.com",   "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { ".2mdn.net",                "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { ".doubleclick.net",         "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE }, /* Ads */
   { "googleads.",               "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "google-analytics.",        "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { "google-analytics.",        "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { "googleusercontent.",       "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { "googleadservices.",        "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { "googleapis.com",           "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { "1e100.net",                "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { "maps.google.",             "GoogleMaps",       NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "maps.gstatic.com",         "GoogleMaps",       NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { "maps.google.",             "GoogleMaps",       NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { "maps.gstatic.com",         "GoogleMaps",       NDPI_PROTOCOL_GOOGLE_MAPS, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
 
-  { ".gmail.",                  "GMail",            NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
-  { "mail.google.",             "GMail",            NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".gmail.",                  "GMail",            NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "mail.google.",             "GMail",            NDPI_PROTOCOL_GMAIL, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { "mail.outlook.com",         "Hotmail",          NDPI_PROTOCOL_HOTMAIL, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, NDPI_PROTOCOL_SAFE },
+  { "mail.outlook.com",         "Hotmail",          NDPI_PROTOCOL_HOTMAIL, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".last.fm",                 "LastFM",           NDPI_PROTOCOL_LASTFM, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_FUN },
+  { ".last.fm",                 "LastFM",           NDPI_PROTOCOL_LASTFM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
 
-  { "msn.com",                  "MSN",              NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_FUN },
+  { "msn.com",                  "MSN",              NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /*News site*/
 
-  { "netflix.com",              "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN  },
-  { "nflxext.com",              "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN  },
+  { "netflix.com",              "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
+  { "nflxext.com",              "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { "nflximg.com",              "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { "nflximg.net",              "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { "nflxvideo.net",            "NetFlix",          NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
@@ -8067,24 +8108,24 @@ ndpi_protocol_match host_match[] = {
   { "e4593.dspg.akamaiedge.net","Skype",            NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
   { "e4593.g.akamaiedge.net",   "Skype",            NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".tuenti.com",              "Tuenti",           NDPI_PROTOCOL_TUENTI, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".tuenti.com",              "Tuenti",           NDPI_PROTOCOL_TUENTI, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".twttr.com",               "Twitter",          NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
-  { "twitter.",                 "Twitter",          NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
-  { "twimg.com",                "Twitter",          NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".twttr.com",               "Twitter",          NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
+  { "twitter.",                 "Twitter",          NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
+  { "twimg.com",                "Twitter",          NDPI_PROTOCOL_TWITTER, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
 
   { ".viber.com",               "Viber",            NDPI_PROTOCOL_VIBER, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
   { ".cdn.viber.com",           "Viber",            NDPI_PROTOCOL_VIBER, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { "wikipedia.",               "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "wikimedia.",               "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "mediawiki.",               "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "wikimediafoundation.",     "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { "wikipedia.",               "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { "wikimedia.",               "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { "mediawiki.",               "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { "wikimediafoundation.",     "Wikipedia",        NDPI_PROTOCOL_WIKIPEDIA, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
 
   { ".whatsapp.",               "WhatsApp",         NDPI_PROTOCOL_WHATSAPP, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".yahoo.",                  "Yahoo",            NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".yimg.com",                "Yahoo",            NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".yahoo.",                  "Yahoo",            NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".yimg.com",                "Yahoo",            NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { "yahooapis.",               "Yahoo",            NDPI_PROTOCOL_YAHOO, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
 
   { "youtube.",                 "YouTube",          NDPI_PROTOCOL_YOUTUBE, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
@@ -8106,7 +8147,7 @@ ndpi_protocol_match host_match[] = {
 
   { ".torproject.org",          "Tor",              NDPI_PROTOCOL_TOR, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
 
-  { ".kakao.com",               "KakaoTalk",        NDPI_PROTOCOL_KAKAOTALK, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_FUN },
+  { ".kakao.com",               "KakaoTalk",        NDPI_PROTOCOL_KAKAOTALK, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
 
   { "ttvnw.net",                "Twitch",           NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { "static-cdn.jtvnw.net",     "Twitch",           NDPI_PROTOCOL_TWITCH, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
@@ -8140,35 +8181,35 @@ ndpi_protocol_match host_match[] = {
 
   { ".waze.com",                "Waze",             NDPI_PROTOCOL_WAZE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".deezer.com",              "Deezer",           NDPI_PROTOCOL_DEEZER, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".deezer.com",              "Deezer",           NDPI_PROTOCOL_DEEZER, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
 
-  { ".microsoft.com",           "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".microsoft.com",           "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { "i-msdn.sec.s-msft.com",    "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM, NDPI_PROTOCOL_ACCEPTABLE },
   { "i2-msdn.sec.s-msft.com",   "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM, NDPI_PROTOCOL_ACCEPTABLE },
   { ".webtrends.com",           "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { ".msecnd.net",              "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { "bing.com",                 "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".visualstudio.com",        "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "bing.com",                 "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
+  { ".visualstudio.com",        "Microsoft",        NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE },
 
   { "bn1301.storage.live.com",      "MS_OneDrive",  NDPI_PROTOCOL_MS_ONE_DRIVE,NDPI_PROTOCOL_CATEGORY_CLOUD,  NDPI_PROTOCOL_ACCEPTABLE },
   { "*.gateway.messenger.live.com", "MS_OneDrive",  NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
   { "skyapi.live.net",              "MS_OneDrive",  NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
   { "d.docs.live.net",              "MS_OneDrive",  NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { "update.microsoft.com",     "WindowsUpdate",    NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".windowsupdate.com",       "WindowsUpdate",    NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_ACCEPTABLE },
+  { "update.microsoft.com",     "WindowsUpdate",    NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
+  { ".windowsupdate.com",       "WindowsUpdate",    NDPI_PROTOCOL_WINDOWS_UPDATE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
 
   { "worldofwarcraft.com",      "WorldOfWarcraft",  NDPI_PROTOCOL_WORLDOFWARCRAFT, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
 
   { ".anchorfree.",             "HotspotShield",    NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
   { "hotspotshield.com",        "HotspotShield",    NDPI_PROTOCOL_HOTSPOT_SHIELD, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
 
-  { ".webex.com",               "Webex",            NDPI_PROTOCOL_WEBEX, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".webex.com",               "Webex",            NDPI_PROTOCOL_WEBEX, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { ".ocsdomain.com",           "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_FUN },
-  { "ocs.fr",                   "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_FUN },
-  { ".ocs.fr",                  "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_FUN },
-  { ".labgency.ws",             "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_FUN },
+  { ".ocsdomain.com",           "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
+  { "ocs.fr",                   "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
+  { ".ocs.fr",                  "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
+  { ".labgency.ws",             "OCS",              NDPI_PROTOCOL_OCS, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
 
   { ".iflix.com",               "IFLIX",            NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { ".app.iflixcorp.com",       "IFLIX",            NDPI_PROTOCOL_IFLIX, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
@@ -8238,7 +8279,9 @@ ndpi_protocol_match host_match[] = {
 
   { "dnscrypt.org",             "DNScrypt",         NDPI_PROTOCOL_DNSCRYPT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE },
 
-  { "torrent.",                 "BitTorrent",       NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_P2P, NDPI_PROTOCOL_ACCEPTABLE },
+  { "torrent.",                 "BitTorrent",       NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_P2P, NDPI_PROTOCOL_UNSAFE },
+  { "torrents.",                "BitTorrent",       NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_P2P, NDPI_PROTOCOL_UNSAFE },
+  { "torrentz.",                "BitTorrent",       NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_CATEGORY_P2P, NDPI_PROTOCOL_UNSAFE },
 
   { ".nintendo.net",            "Nintendo",         NDPI_PROTOCOL_NINTENDO, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
   { ".nintendo.com",            "Nintendo",         NDPI_PROTOCOL_NINTENDO, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
@@ -8246,6 +8289,11 @@ ndpi_protocol_match host_match[] = {
   { ".playstation.com",             "Playstation",  NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
   { ".sonyentertainmentnetwork.com","Playstation",  NDPI_PROTOCOL_PLAYSTATION, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
 
+  { ".pastebin.com",            "Pastebin",         NDPI_PROTOCOL_PASTEBIN, NDPI_PROTOCOL_CATEGORY_FILE_TRANSFER, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
+
+  { ".linkedin.com",            "LinkedIn",         NDPI_PROTOCOL_LINKEDIN, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
+  { ".licdn.com",               "LinkedIn",         NDPI_PROTOCOL_LINKEDIN, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
+
   { NULL, 0 }
 };