diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2015-07-12 23:54:59 +0200 |
|---|---|---|
| committer | Luca Deri <lucaderi@users.noreply.github.com> | 2015-07-12 23:54:59 +0200 |
| commit | f3105f6c8177165908a79cfe870e177ecc674c07 (patch) | |
| tree | 20660c11ee81b17c0ca165226646e7d43517de79 /src | |
| parent | 312c7ce1aff1322974b3d3d89c88887c5287822b (diff) | |
| parent | 5c55b970c6a25face44a7f10ac5756861d3750cb (diff) | |
Merge pull request #64 from backer-and/dev
Added Instagram detection service
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 3 | ||||
| -rw-r--r-- | src/lib/ndpi_content_match.c.inc | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index ab649497c..1df8578fe 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -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) diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index 39b3ccacf..d15244c5e 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -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 }, |