diff options
| author | Michele Campus <fci1908@gmail.com> | 2016-11-11 18:46:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 18:46:22 +0100 |
| commit | 4564b973df4fd6bbc90782ee98f80e459416b244 (patch) | |
| tree | 866df24d98f3cd68a76f1857801d4a79aafdd66a | |
| parent | 7758bc821eceecd98ab08ed5cb4a73ac2e30e34e (diff) | |
| parent | 2586618c1b8c5c8af6413c1dcda9f3a00da6be4e (diff) | |
Merge pull request #289 from mkfsn/service-github
Add Github service
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 3 | ||||
| -rw-r--r-- | src/lib/ndpi_content_match.c.inc | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index d4118d740..be55e94e1 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -263,9 +263,10 @@ #define NDPI_SERVICE_SINA 210 #define NDPI_SERVICE_HANGOUT 214 #define NDPI_SERVICE_IFLIX 215 /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */ +#define NDPI_SERVICE_GITHUB 216 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ -#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_IFLIX +#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_GITHUB #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 4db6c1127..b7e3982c3 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -7292,6 +7292,12 @@ static ndpi_network host_protocol_list[] = { */ { 0x4A730000, 21, NDPI_SERVICE_HOTSPOT_SHIELD }, + /* + Github: https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/ + 192.30.252.0/22 + */ + { 0xC01EFC00 /* 192.30.252.0/22 */, 22, NDPI_SERVICE_GITHUB }, + { 0x0, 0, 0 } }; @@ -7474,6 +7480,14 @@ ndpi_protocol_match host_match[] = { /* Detected "slack-assets2.s3-us-west-2.amazonaws.com.". Omitted "*amazonaws.com" CDN, but no generic pattern to use on first part */ { "slack-assets2.s3-", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, + { "github.com", "Github", NDPI_SERVICE_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, + { ".github.com", "Github", NDPI_SERVICE_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, + /* https://github.com/blog/1452-new-github-pages-domain-github-io */ + { "github.io", "Github", NDPI_SERVICE_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, + { ".github.io", "Github", NDPI_SERVICE_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, + /* https://developer.github.com/changes/2014-04-25-user-content-security/ */ + { "githubusercontent.com", "Github", NDPI_SERVICE_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, + { ".githubusercontent.com", "Github", NDPI_SERVICE_GITHUB, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE }, { NULL, 0 } }; |