Merge pull request #64 from backer-and/dev

Added Instagram detection service
This commit is contained in:
Luca Deri
2015-07-12 23:54:59 +02:00
3 changed files with 11 additions and 5 deletions
+2 -1
View File
@@ -257,9 +257,10 @@
#define NDPI_SERVICE_TIMRECARGA 208
#define NDPI_SERVICE_TIMBETA 209
#define NDPI_SERVICE_DEEZER 210
#define NDPI_SERVICE_INSTAGRAM 211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com>
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_DEEZER
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_INSTAGRAM
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
+9 -4
View File
@@ -71,7 +71,7 @@ static ndpi_network host_protocol_list[] = {
{ 0xC72FD800 /* 199.47.216.0 */, 22, NDPI_PROTOCOL_DROPBOX },
{ 0x6CA0A000 /* 108.160.160.0 */, 20, NDPI_PROTOCOL_DROPBOX },
/*
/*
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
@@ -108,7 +108,7 @@ static ndpi_network host_protocol_list[] = {
origin: AS62014
mnt-by: MNT-TELEGRAM
source: RIPE # Filtered
http://myip.ms/view/web_hosting/363906/Telegram_Messenger_Network.html
*/
{ 0x959AA400 /* 149.154.164.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM},
@@ -7215,7 +7215,7 @@ static ndpi_network host_protocol_list[] = {
{ 0xDF85F4CA, 32, NDPI_PROTOCOL_TOR },
{ 0xDFE57B41, 32, NDPI_PROTOCOL_TOR },
/*
/*
Twitch ingestion servers :
https://api.twitch.tv/kraken/ingests
Edoardo Dominici edoaramis@gmail.com
@@ -7282,7 +7282,7 @@ static ndpi_network host_protocol_list[] = {
{ 0xC709F98C, 32, NDPI_SERVICE_TWITCH },
{ 0xC709F9C5, 32, NDPI_SERVICE_TWITCH },
/* Simet - 200.160.4.0/24 */
/* Simet - 200.160.4.0/24 */
{ 0xC8A00400, 24, NDPI_SERVICE_SIMET },
{ 0x0, 0, 0 }
@@ -7380,6 +7380,11 @@ ndpi_protocol_match host_match[] = {
{ "feelinsonice-hrd.appspot.com", "Snapchat", NDPI_SERVICE_SNAPCHAT, NDPI_PROTOCOL_FUN },
{ "feelinsonice.com", "Snapchat", NDPI_SERVICE_SNAPCHAT, NDPI_PROTOCOL_FUN },
/* Detected "instagram.c10r.facebook.com". Omitted "*amazonaws.com" and "*facebook.com" CDNs e.g. "ig-telegraph-shv-04-frc3.facebook.com" */
{ ".cdninstagram.com", "Instagram", NDPI_SERVICE_INSTAGRAM, NDPI_PROTOCOL_FUN },
{ "instagram.", "Instagram", NDPI_SERVICE_INSTAGRAM, NDPI_PROTOCOL_FUN },
{ ".instagram.", "Instagram", NDPI_SERVICE_INSTAGRAM, NDPI_PROTOCOL_FUN },
{ ".waze.com", "Waze", NDPI_SERVICE_WAZE, NDPI_PROTOCOL_ACCEPTABLE },
{ "simet-", "Simet", NDPI_SERVICE_SIMET, NDPI_PROTOCOL_ACCEPTABLE },
{ "opensignal.com", "OpenSignal", NDPI_SERVICE_OPENSIGNAL, NDPI_PROTOCOL_ACCEPTABLE },
Binary file not shown.