diff options
| author | Michele Campus <fci1908@gmail.com> | 2016-08-13 10:54:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-13 10:54:27 +0200 |
| commit | d1bf5d2bb692eb68cf4a9bf96a434f32b8041369 (patch) | |
| tree | c657ff8bf2f95b238edfe17d49cb43a9ceffc382 | |
| parent | 5e399498c3ca5a1c6c66200bd16105a0beca00a5 (diff) | |
| parent | 9c2eba2009f4bc52d44ad43ca1a0d5de73fab392 (diff) | |
Merge pull request #245 from denisvm/service-slack
added Slack service
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 3 | ||||
| -rw-r--r-- | src/lib/ndpi_content_match.c.inc | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 6b193531f..df91f7c59 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -263,9 +263,10 @@ #define NDPI_PROTOCOL_RX 209 #define NDPI_SERVICE_WEIBO 210 #define NDPI_SERVICE_HANGOUT 215 +#define NDPI_SERVICE_SLACK 216 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ -#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_HANGOUT +#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_SLACK #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 6604c675c..47778105f 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -7400,6 +7400,16 @@ ndpi_protocol_match host_match[] = { { "d295hzzivaok4k.cloudfront.net", "OpenDNS", NDPI_SERVICE_OPENDNS, NDPI_PROTOCOL_ACCEPTABLE }, { ".opendns.com", "OpenDNS", NDPI_SERVICE_OPENDNS, NDPI_PROTOCOL_ACCEPTABLE }, + /* https://get.slack.help/hc/en-us/articles/205138367-Troubleshooting-Slack-connection-issues */ + { "slack.com", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + { ".slack-msgs.com", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + { "slack-files.com", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + { "slack-imgs.com", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + { ".slack-edge.com", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + { ".slack-core.com", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + { "slack-redir.net", "Slack", NDPI_SERVICE_SLACK, NDPI_PROTOCOL_ACCEPTABLE }, + /* 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_ACCEPTABLE }, { NULL, 0 } |