aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/ndpi_protocol_ids.h2
-rw-r--r--src/lib/inc_generated/ndpi_asn_alibaba.c.inc25
-rw-r--r--src/lib/inc_generated/ndpi_asn_bloomberg.c.inc3
-rw-r--r--src/lib/inc_generated/ndpi_asn_canonical.c.inc (renamed from src/lib/inc_generated/ndpi_asn_ubuntuone.c.inc)24
-rw-r--r--src/lib/inc_generated/ndpi_asn_edgecast.c.inc13
-rw-r--r--src/lib/inc_generated/ndpi_asn_nvidia.c.inc1
-rw-r--r--src/lib/inc_generated/ndpi_asn_opendns.c.inc23
-rw-r--r--src/lib/inc_generated/ndpi_asn_webex.c.inc4
-rw-r--r--src/lib/inc_generated/ndpi_asn_yandex.c.inc2
-rw-r--r--src/lib/ndpi_content_match.c.inc7
-rw-r--r--src/lib/ndpi_main.c12
11 files changed, 51 insertions, 65 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 31cdfc1d9..85b2c0867 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -197,7 +197,7 @@ typedef enum {
NDPI_PROTOCOL_RSYNC = 166,
NDPI_PROTOCOL_ORACLE = 167,
NDPI_PROTOCOL_CORBA = 168,
- NDPI_PROTOCOL_UBUNTUONE = 169,
+ NDPI_PROTOCOL_CANONICAL = 169,
NDPI_PROTOCOL_WHOIS_DAS = 170,
NDPI_PROTOCOL_SD_RTN = 171, /* Agora SD-RTN: https://www.agora.io/en */
NDPI_PROTOCOL_SOCKS = 172,
diff --git a/src/lib/inc_generated/ndpi_asn_alibaba.c.inc b/src/lib/inc_generated/ndpi_asn_alibaba.c.inc
index 40de1abc0..bbeea9ace 100644
--- a/src/lib/inc_generated/ndpi_asn_alibaba.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_alibaba.c.inc
@@ -32,6 +32,9 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x08900000 /* 8.144.0.0/14 */, 14, NDPI_PROTOCOL_ALIBABA },
{ 0x08940000 /* 8.148.0.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
{ 0x08942000 /* 8.148.32.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
+ { 0x08942400 /* 8.148.36.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
+ { 0x08942600 /* 8.148.38.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
+ { 0x08942800 /* 8.148.40.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
{ 0x08942A00 /* 8.148.42.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
{ 0x08944000 /* 8.148.64.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
{ 0x08948000 /* 8.148.128.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
@@ -41,6 +44,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x08980000 /* 8.152.0.0/13 */, 13, NDPI_PROTOCOL_ALIBABA },
{ 0x08A00000 /* 8.160.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
{ 0x08A20000 /* 8.162.0.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
+ { 0x08A30000 /* 8.163.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x08D00000 /* 8.208.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x08D10000 /* 8.209.0.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
{ 0x08D12400 /* 8.209.36.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
@@ -90,6 +94,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x2B606600 /* 43.96.102.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
{ 0x2B620000 /* 43.98.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
{ 0x2B640000 /* 43.100.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
+ { 0x2B680000 /* 43.104.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
{ 0x2D59C800 /* 45.89.200.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
{ 0x2D712800 /* 45.113.40.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
{ 0x2DC23800 /* 45.194.56.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
@@ -97,9 +102,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x2DC7B300 /* 45.199.179.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
{ 0x2F340000 /* 47.52.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x2F380000 /* 47.56.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
- { 0x2F4A0000 /* 47.74.0.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
- { 0x2F4A8000 /* 47.74.128.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
- { 0x2F4B0000 /* 47.75.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
+ { 0x2F4A0000 /* 47.74.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
{ 0x2F4C0000 /* 47.76.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x2F4D0000 /* 47.77.0.0/20 */, 20, NDPI_PROTOCOL_ALIBABA },
{ 0x2F4D1000 /* 47.77.16.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
@@ -121,6 +124,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x2F578000 /* 47.87.128.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
{ 0x2F57C000 /* 47.87.192.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
{ 0x2F57E000 /* 47.87.224.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
+ { 0x2F57E800 /* 47.87.232.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
{ 0x2F580000 /* 47.88.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x2F590000 /* 47.89.0.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
{ 0x2F594800 /* 47.89.72.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
@@ -163,14 +167,9 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x2FF6A000 /* 47.246.160.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
{ 0x2FF6C000 /* 47.246.192.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
{ 0x2FFA0000 /* 47.250.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
- { 0x2FFC0000 /* 47.252.0.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
- { 0x2FFD0000 /* 47.253.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
+ { 0x2FFC0000 /* 47.252.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
{ 0x2FFE0000 /* 47.254.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
- { 0x3B520000 /* 59.82.0.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
- { 0x3B524000 /* 59.82.64.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
- { 0x3B526000 /* 59.82.96.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
- { 0x3B526800 /* 59.82.104.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
- { 0x3B527000 /* 59.82.112.0/20 */, 20, NDPI_PROTOCOL_ALIBABA },
+ { 0x3B520000 /* 59.82.0.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
{ 0x3B528000 /* 59.82.128.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
{ 0x3B528800 /* 59.82.136.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
{ 0x3B6E0000 /* 59.110.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
@@ -217,7 +216,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0x8BC40000 /* 139.196.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x8BE00000 /* 139.224.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x8CCD0000 /* 140.205.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
- { 0x938B8000 /* 147.139.128.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
+ { 0x938B0000 /* 147.139.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
{ 0x95810000 /* 149.129.0.0/20 */, 20, NDPI_PROTOCOL_ALIBABA },
{ 0x95811000 /* 149.129.16.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
{ 0x95812000 /* 149.129.32.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
@@ -278,7 +277,9 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
{ 0xCB77B000 /* 203.119.176.0/20 */, 20, NDPI_PROTOCOL_ALIBABA },
{ 0xCB77C000 /* 203.119.192.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
{ 0xCBD1E000 /* 203.209.224.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
- { 0xCDC62800 /* 205.198.40.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
+ { 0xCDC62800 /* 205.198.40.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
+ { 0xCDC62C00 /* 205.198.44.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
+ { 0xCDC62E00 /* 205.198.46.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
{ 0xCDCC6000 /* 205.204.96.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
{ 0xD1927600 /* 209.146.118.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
{ 0xDAF48000 /* 218.244.128.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
diff --git a/src/lib/inc_generated/ndpi_asn_bloomberg.c.inc b/src/lib/inc_generated/ndpi_asn_bloomberg.c.inc
index 7707985ec..3520fc40a 100644
--- a/src/lib/inc_generated/ndpi_asn_bloomberg.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_bloomberg.c.inc
@@ -24,8 +24,7 @@ static ndpi_network ndpi_protocol_bloomberg_protocol_list[] = {
{ 0x3F580300 /* 63.88.3.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
{ 0x4173E200 /* 65.115.226.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
{ 0x45BB1000 /* 69.187.16.0/21 */, 21, NDPI_PROTOCOL_BLOOMBERG },
- { 0x45BB1800 /* 69.187.24.0/23 */, 23, NDPI_PROTOCOL_BLOOMBERG },
- { 0x45BB1A00 /* 69.187.26.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
+ { 0x45BB1800 /* 69.187.24.0/22 */, 22, NDPI_PROTOCOL_BLOOMBERG },
{ 0x45BB1D00 /* 69.187.29.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
{ 0x45BB1F00 /* 69.187.31.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
{ 0x45BB2000 /* 69.187.32.0/22 */, 22, NDPI_PROTOCOL_BLOOMBERG },
diff --git a/src/lib/inc_generated/ndpi_asn_ubuntuone.c.inc b/src/lib/inc_generated/ndpi_asn_canonical.c.inc
index 88c597b48..2023950f1 100644
--- a/src/lib/inc_generated/ndpi_asn_ubuntuone.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_canonical.c.inc
@@ -20,22 +20,22 @@
/* ****************************************************** */
-static ndpi_network ndpi_protocol_ubuntuone_protocol_list[] = {
- { 0x5BBD5800 /* 91.189.88.0/21 */, 21, NDPI_PROTOCOL_UBUNTUONE },
- { 0xA2D52000 /* 162.213.32.0/24 */, 24, NDPI_PROTOCOL_UBUNTUONE },
- { 0xA2D52200 /* 162.213.34.0/23 */, 23, NDPI_PROTOCOL_UBUNTUONE },
- { 0xB97DBC00 /* 185.125.188.0/23 */, 23, NDPI_PROTOCOL_UBUNTUONE },
- { 0xB97DBE00 /* 185.125.190.0/24 */, 24, NDPI_PROTOCOL_UBUNTUONE },
- { 0xC2A9FE00 /* 194.169.254.0/24 */, 24, NDPI_PROTOCOL_UBUNTUONE },
+static ndpi_network ndpi_protocol_canonical_protocol_list[] = {
+ { 0x5BBD5800 /* 91.189.88.0/21 */, 21, NDPI_PROTOCOL_CANONICAL },
+ { 0xA2D52000 /* 162.213.32.0/24 */, 24, NDPI_PROTOCOL_CANONICAL },
+ { 0xA2D52200 /* 162.213.34.0/23 */, 23, NDPI_PROTOCOL_CANONICAL },
+ { 0xB97DBC00 /* 185.125.188.0/23 */, 23, NDPI_PROTOCOL_CANONICAL },
+ { 0xB97DBE00 /* 185.125.190.0/24 */, 24, NDPI_PROTOCOL_CANONICAL },
+ { 0xC2A9FE00 /* 194.169.254.0/24 */, 24, NDPI_PROTOCOL_CANONICAL },
/* End */
{ 0x0, 0, 0 }
};
-static ndpi_network6 ndpi_protocol_ubuntuone_protocol_list_6[] = {
- { "2001:67c:1560::", 48, NDPI_PROTOCOL_UBUNTUONE },
- { "2001:67c:1562::", 48, NDPI_PROTOCOL_UBUNTUONE },
- { "2620:2d:4000::", 46, NDPI_PROTOCOL_UBUNTUONE },
- { "2a06:bc80::", 47, NDPI_PROTOCOL_UBUNTUONE },
+static ndpi_network6 ndpi_protocol_canonical_protocol_list_6[] = {
+ { "2001:67c:1560::", 48, NDPI_PROTOCOL_CANONICAL },
+ { "2001:67c:1562::", 48, NDPI_PROTOCOL_CANONICAL },
+ { "2620:2d:4000::", 46, NDPI_PROTOCOL_CANONICAL },
+ { "2a06:bc80::", 47, NDPI_PROTOCOL_CANONICAL },
/* End */
{ NULL, 0, 0 }
};
diff --git a/src/lib/inc_generated/ndpi_asn_edgecast.c.inc b/src/lib/inc_generated/ndpi_asn_edgecast.c.inc
index 013a27e40..5e2687cfb 100644
--- a/src/lib/inc_generated/ndpi_asn_edgecast.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_edgecast.c.inc
@@ -22,10 +22,8 @@
static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
{ 0x2E164C00 /* 46.22.76.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
- { 0x400C4800 /* 64.12.72.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x400C8200 /* 64.12.130.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x400C8A00 /* 64.12.138.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
- { 0x400C9400 /* 64.12.148.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x44E82200 /* 68.232.34.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x44E82400 /* 68.232.36.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0x44E82600 /* 68.232.38.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
@@ -36,7 +34,6 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
{ 0x6CA1F500 /* 108.161.245.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x6CA1FD00 /* 108.161.253.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x6CA1FE00 /* 108.161.254.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
- { 0x98C30400 /* 152.195.4.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C34C00 /* 152.195.76.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0x98C35800 /* 152.195.88.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0x98C36800 /* 152.195.104.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
@@ -44,13 +41,11 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
{ 0x98C39F00 /* 152.195.159.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3A100 /* 152.195.161.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3A200 /* 152.195.162.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
- { 0x98C3A600 /* 152.195.166.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3A800 /* 152.195.168.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3AA00 /* 152.195.170.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3B300 /* 152.195.179.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3C000 /* 152.195.192.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
{ 0x98C3C400 /* 152.195.196.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
- { 0x98C3E400 /* 152.195.228.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0x98C70600 /* 152.199.6.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C71500 /* 152.199.21.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0x98C71800 /* 152.199.24.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
@@ -66,13 +61,10 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
{ 0xC0102600 /* 192.16.38.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC0103C00 /* 192.16.60.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC01E1800 /* 192.30.24.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
- { 0xC0E58100 /* 192.229.129.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E58600 /* 192.229.134.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
- { 0xC0E58900 /* 192.229.137.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E59600 /* 192.229.150.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E59C00 /* 192.229.156.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E5A800 /* 192.229.168.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
- { 0xC0E5B200 /* 192.229.178.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E5B400 /* 192.229.180.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E5B700 /* 192.229.183.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E5B800 /* 192.229.184.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
@@ -87,7 +79,6 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
{ 0xC0E5EC00 /* 192.229.236.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC0E5FE00 /* 192.229.254.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
{ 0xC6071000 /* 198.7.16.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
- { 0xC6071B00 /* 198.7.27.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
{ 0xC6071D00 /* 198.7.29.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
/* End */
{ 0x0, 0, 0 }
@@ -118,7 +109,6 @@ static ndpi_network6 ndpi_protocol_edgecast_protocol_list_6[] = {
{ "2606:2800:3fff::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4002::", 47, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4006::", 47, NDPI_PROTOCOL_EDGECAST },
- { "2606:2800:4008::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:400c::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:400e::", 47, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4014::", 48, NDPI_PROTOCOL_EDGECAST },
@@ -131,8 +121,6 @@ static ndpi_network6 ndpi_protocol_edgecast_protocol_list_6[] = {
{ "2606:2800:424a::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4267::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4268::", 48, NDPI_PROTOCOL_EDGECAST },
- { "2606:2800:4a8a::", 48, NDPI_PROTOCOL_EDGECAST },
- { "2606:2800:4a8c::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4a94::", 47, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4ad4::", 47, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:4adc::", 47, NDPI_PROTOCOL_EDGECAST },
@@ -143,7 +131,6 @@ static ndpi_network6 ndpi_protocol_edgecast_protocol_list_6[] = {
{ "2606:2800:6028::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:7003::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:700e::", 48, NDPI_PROTOCOL_EDGECAST },
- { "2606:2800:7032::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:e401::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:e409::", 48, NDPI_PROTOCOL_EDGECAST },
{ "2606:2800:e413::", 48, NDPI_PROTOCOL_EDGECAST },
diff --git a/src/lib/inc_generated/ndpi_asn_nvidia.c.inc b/src/lib/inc_generated/ndpi_asn_nvidia.c.inc
index 831925a60..d039d5550 100644
--- a/src/lib/inc_generated/ndpi_asn_nvidia.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_nvidia.c.inc
@@ -38,6 +38,7 @@ static ndpi_network ndpi_protocol_nvidia_protocol_list[] = {
{ 0x42169000 /* 66.22.144.0/22 */, 22, NDPI_PROTOCOL_NVIDIA },
{ 0x42169400 /* 66.22.148.0/23 */, 23, NDPI_PROTOCOL_NVIDIA },
{ 0x42169600 /* 66.22.150.0/24 */, 24, NDPI_PROTOCOL_NVIDIA },
+ { 0x42169F00 /* 66.22.159.0/24 */, 24, NDPI_PROTOCOL_NVIDIA },
{ 0x48194000 /* 72.25.64.0/21 */, 21, NDPI_PROTOCOL_NVIDIA },
{ 0x48196000 /* 72.25.96.0/23 */, 23, NDPI_PROTOCOL_NVIDIA },
{ 0x4D6FF800 /* 77.111.248.0/22 */, 22, NDPI_PROTOCOL_NVIDIA },
diff --git a/src/lib/inc_generated/ndpi_asn_opendns.c.inc b/src/lib/inc_generated/ndpi_asn_opendns.c.inc
index 74e9e2b5d..90c9ffd87 100644
--- a/src/lib/inc_generated/ndpi_asn_opendns.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_opendns.c.inc
@@ -162,25 +162,18 @@ static ndpi_network ndpi_protocol_opendns_protocol_list[] = {
{ 0x9BBE6800 /* 155.190.104.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBE6D00 /* 155.190.109.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBE6E00 /* 155.190.110.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBE7000 /* 155.190.112.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBE7600 /* 155.190.118.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBE8000 /* 155.190.128.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBE8400 /* 155.190.132.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBE8600 /* 155.190.134.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
+ { 0x9BBE8000 /* 155.190.128.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
+ { 0x9BBE8900 /* 155.190.137.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
+ { 0x9BBE8A00 /* 155.190.138.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
+ { 0x9BBE8C00 /* 155.190.140.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBE9C00 /* 155.190.156.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEA000 /* 155.190.160.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEB300 /* 155.190.179.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEB700 /* 155.190.183.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEBC00 /* 155.190.188.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEBE00 /* 155.190.190.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBEC000 /* 155.190.192.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBEC800 /* 155.190.200.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBECC00 /* 155.190.204.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBECE00 /* 155.190.206.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBED000 /* 155.190.208.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBED800 /* 155.190.216.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBEDB00 /* 155.190.219.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
- { 0x9BBEDC00 /* 155.190.220.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
+ { 0x9BBEC000 /* 155.190.192.0/19 */, 19, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEE000 /* 155.190.224.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEE400 /* 155.190.228.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEE600 /* 155.190.230.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
@@ -191,12 +184,10 @@ static ndpi_network ndpi_protocol_opendns_protocol_list[] = {
{ 0x9BBEF000 /* 155.190.240.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEF500 /* 155.190.245.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEF600 /* 155.190.246.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
+ { 0x9BBEF800 /* 155.190.248.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEFA00 /* 155.190.250.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
{ 0x9BBEFF00 /* 155.190.255.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
- { 0xA2D25000 /* 162.210.80.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
- { 0xA2D25200 /* 162.210.82.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
- { 0xA2D25500 /* 162.210.85.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
- { 0xA2D25600 /* 162.210.86.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
+ { 0xA2D25000 /* 162.210.80.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
{ 0xB93C5400 /* 185.60.84.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
{ 0xB93C5600 /* 185.60.86.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
{ 0xC6290D00 /* 198.41.13.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
diff --git a/src/lib/inc_generated/ndpi_asn_webex.c.inc b/src/lib/inc_generated/ndpi_asn_webex.c.inc
index 814ab619f..10457f87b 100644
--- a/src/lib/inc_generated/ndpi_asn_webex.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_webex.c.inc
@@ -79,9 +79,13 @@ static ndpi_network6 ndpi_protocol_webex_protocol_list_6[] = {
{ "2402:2500:100::", 40, NDPI_PROTOCOL_WEBEX },
{ "2402:2500:200::", 39, NDPI_PROTOCOL_WEBEX },
{ "2402:2500:400::", 39, NDPI_PROTOCOL_WEBEX },
+ { "2402:2500:1010::", 44, NDPI_PROTOCOL_WEBEX },
{ "2402:2500:1040::", 44, NDPI_PROTOCOL_WEBEX },
+ { "2402:2500:1200::", 44, NDPI_PROTOCOL_WEBEX },
{ "2402:2500:1500::", 44, NDPI_PROTOCOL_WEBEX },
+ { "2402:2500:2010::", 44, NDPI_PROTOCOL_WEBEX },
{ "2402:2500:2040::", 44, NDPI_PROTOCOL_WEBEX },
+ { "2402:2500:2200::", 44, NDPI_PROTOCOL_WEBEX },
{ "2402:2500:2500::", 44, NDPI_PROTOCOL_WEBEX },
{ "2607:fcf0::", 32, NDPI_PROTOCOL_WEBEX },
{ "2a00:a640:100::", 40, NDPI_PROTOCOL_WEBEX },
diff --git a/src/lib/inc_generated/ndpi_asn_yandex.c.inc b/src/lib/inc_generated/ndpi_asn_yandex.c.inc
index 5495a5ea5..5a8d5bebf 100644
--- a/src/lib/inc_generated/ndpi_asn_yandex.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_yandex.c.inc
@@ -26,9 +26,9 @@ static ndpi_network ndpi_protocol_yandex_protocol_list[] = {
{ 0x25094000 /* 37.9.64.0/18 */, 18, NDPI_PROTOCOL_YANDEX },
{ 0x258C8000 /* 37.140.128.0/18 */, 18, NDPI_PROTOCOL_YANDEX },
{ 0x4D580000 /* 77.88.0.0/18 */, 18, NDPI_PROTOCOL_YANDEX },
+ { 0x4E9DE800 /* 78.157.232.0/23 */, 23, NDPI_PROTOCOL_YANDEX },
{ 0x54FCA000 /* 84.252.160.0/19 */, 19, NDPI_PROTOCOL_YANDEX },
{ 0x57FAE000 /* 87.250.224.0/19 */, 19, NDPI_PROTOCOL_YANDEX },
- { 0x5A9CB600 /* 90.156.182.0/24 */, 24, NDPI_PROTOCOL_YANDEX },
{ 0x5A9CB800 /* 90.156.184.0/24 */, 24, NDPI_PROTOCOL_YANDEX },
{ 0x5A9CBA00 /* 90.156.186.0/24 */, 24, NDPI_PROTOCOL_YANDEX },
{ 0x5B6B5000 /* 91.107.80.0/22 */, 22, NDPI_PROTOCOL_YANDEX },
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index bc9b278a5..611f7b393 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -1008,8 +1008,11 @@ static ndpi_protocol_match host_match[] =
{ "huluim.com", "Hulu", NDPI_PROTOCOL_HULU, NDPI_PROTOCOL_CATEGORY_STREAMING, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
- { "snapcraft.io", "UbuntuONE", NDPI_PROTOCOL_UBUNTUONE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
- { "ubuntu.com", "UbuntuONE", NDPI_PROTOCOL_UBUNTUONE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
+ { "snapcraft.io", "Canonical", NDPI_PROTOCOL_CANONICAL, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
+ { "ubuntu.com", "Canonical", NDPI_PROTOCOL_CANONICAL, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
+ { "cdn.snapcraftcontent.com", "Canonical", NDPI_PROTOCOL_CANONICAL, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
+ { "launchpadcontent.net", "Canonical", NDPI_PROTOCOL_CANONICAL, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
+ { "launchpad.net", "Canonical", NDPI_PROTOCOL_CANONICAL, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "signal.org", "Signal", NDPI_PROTOCOL_SIGNAL, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
{ "whispersystems.org", "Signal", NDPI_PROTOCOL_SIGNAL, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 5126e6f1d..8e7a86a92 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -101,7 +101,7 @@
#include "inc_generated/ndpi_asn_opendns.c.inc"
#include "inc_generated/ndpi_asn_dropbox.c.inc"
#include "inc_generated/ndpi_asn_blizzard.c.inc"
-#include "inc_generated/ndpi_asn_ubuntuone.c.inc"
+#include "inc_generated/ndpi_asn_canonical.c.inc"
#include "inc_generated/ndpi_asn_twitch.c.inc"
#include "inc_generated/ndpi_asn_hotspotshield.c.inc"
#include "inc_generated/ndpi_asn_github.c.inc"
@@ -1744,8 +1744,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"Corba", NDPI_PROTOCOL_CATEGORY_RPC, NDPI_PROTOCOL_QOE_CATEGORY_UNSPECIFIED,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
- ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_UBUNTUONE,
- "UbuntuONE", NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_QOE_CATEGORY_UNSPECIFIED,
+ ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_CANONICAL,
+ "Canonical", NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_QOE_CATEGORY_UNSPECIFIED,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_WHOIS_DAS,
@@ -3858,9 +3858,9 @@ int ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str)
ndpi_init_ptree_ipv4(ndpi_str->protocols->v4, ndpi_protocol_blizzard_protocol_list);
ndpi_init_ptree_ipv6(ndpi_str, ndpi_str->protocols->v6, ndpi_protocol_blizzard_protocol_list_6);
}
- if(is_ip_list_enabled(ndpi_str, NDPI_PROTOCOL_UBUNTUONE)) {
- ndpi_init_ptree_ipv4(ndpi_str->protocols->v4, ndpi_protocol_ubuntuone_protocol_list);
- ndpi_init_ptree_ipv6(ndpi_str, ndpi_str->protocols->v6, ndpi_protocol_ubuntuone_protocol_list_6);
+ if(is_ip_list_enabled(ndpi_str, NDPI_PROTOCOL_CANONICAL)) {
+ ndpi_init_ptree_ipv4(ndpi_str->protocols->v4, ndpi_protocol_canonical_protocol_list);
+ ndpi_init_ptree_ipv6(ndpi_str, ndpi_str->protocols->v6, ndpi_protocol_canonical_protocol_list_6);
}
if(is_ip_list_enabled(ndpi_str, NDPI_PROTOCOL_TWITCH)) {
ndpi_init_ptree_ipv4(ndpi_str->protocols->v4, ndpi_protocol_twitch_protocol_list);
Powered by cgit, Themed by Ted Yin.