diff options
| author | Daniele De Lorenzi <daniele.delorenzi@fastnetserv.net> | 2018-05-25 21:57:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 21:57:38 +0200 |
| commit | 9af00fdb4c169f537cddd7bdc925b0654e3eea44 (patch) | |
| tree | b243602133eb89e6636a00f880bf4a43b65a16f0 /src | |
| parent | 5171309c4377ed26b3dbfbb15c709c9adee9d91a (diff) | |
| parent | 6c2cfb34f7c608428b02dee879692e4e00e7e6e7 (diff) | |
Merge branch 'dev' into rapidvideo
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_content_match.c.inc | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 02c04b48a..9dd6002eb 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -283,6 +283,7 @@ #define NDPI_PROTOCOL_AMAZON_VIDEO 240 #define NDPI_PROTOCOL_GOOGLE_DOCS 241 #define NDPI_PROTOCOL_WHATSAPP_FILES 242 /* Videos, pictures, voice messages... */ +#define NDPI_PROTOCOL_VIDTO 243 /* VidTO streaming service */ #define NDPI_PROTOCOL_RAPIDVIDEO 244 /* RapidVideo streaming */ /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index 4a7e5190d..d65565b3c 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -7925,6 +7925,7 @@ static ndpi_network host_protocol_list[] = { Valve Corporation (Steam) origin AS32590 */ + { 0x2D79B800 /* 45.121.184.0/22 */, 22, NDPI_PROTOCOL_STEAM }, { 0x670A7C00 /* 103.10.124.0/23 */, 23, NDPI_PROTOCOL_STEAM }, { 0x671C3600 /* 103.28.54.0/23 */, 23, NDPI_PROTOCOL_STEAM }, @@ -7942,7 +7943,15 @@ static ndpi_network host_protocol_list[] = { { 0xD040C800 /* 208.64.200.0/24 */, 24, NDPI_PROTOCOL_STEAM }, { 0xD040C900 /* 208.64.201.0/22 */, 22, NDPI_PROTOCOL_STEAM }, { 0xD04EA400 /* 208.78.164.0/22 */, 22, NDPI_PROTOCOL_STEAM }, - + + /* + VidTO + */ + + { 0x51111030 /* 81.17.16.48/32 */, 32, NDPI_PROTOCOL_VIDTO }, + { 0x5fb7329d /* 95.183.50.157/32 */, 32, NDPI_PROTOCOL_VIDTO }, + { 0x577824f2 /* 87.120.36.242/32 */, 32, NDPI_PROTOCOL_VIDTO }, + { 0x0, 0, 0 } }; @@ -8358,6 +8367,9 @@ ndpi_protocol_match host_match[] = { { ".icq.", NULL, NULL, "ICQ", NDPI_PROTOCOL_ICQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE }, { "icq.", NULL, NULL, "ICQ", NDPI_PROTOCOL_ICQ, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE }, + + { ".vidto.me", NULL, NULL, "VidTO", NDPI_PROTOCOL_VIDTO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN }, + { ".vidto.se", NULL, NULL, "VidTO", NDPI_PROTOCOL_VIDTO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN }, { ".rapidvideo.com", NULL, NULL, "RapidVideo", NDPI_PROTOCOL_RAPIDVIDEO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN }, { ".playercdn.net", NULL, NULL, "RapidVideo", NDPI_PROTOCOL_RAPIDVIDEO, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN }, |