aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/protocols.rst9
-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
-rw-r--r--tests/cfgs/default/pcap/sites.pcapngbin524348 -> 526664 bytes
-rw-r--r--tests/cfgs/default/result/sites.pcapng.out35
-rwxr-xr-xutils/asn_update.sh8
15 files changed, 83 insertions, 85 deletions
diff --git a/doc/protocols.rst b/doc/protocols.rst
index 01d59f6fb..f2f4b3ca0 100644
--- a/doc/protocols.rst
+++ b/doc/protocols.rst
@@ -128,6 +128,15 @@ HCL Notes (formerly IBM Lotus Notes) is a client-server collaborative applicatio
References: `Main site: <https://www.hcl-software.com/notes>`_
+.. _Proto 169:
+
+`NDPI_PROTOCOL_CANONICAL`
+==========================
+Canonical Ltd. is a technology company known for developing open-source software solutions, including the Ubuntu Linux distribution and related cloud and IoT services.
+
+References: `Main site: <https://canonical.com/>`
+
+
.. _Proto 174:
`NDPI_PROTOCOL_RTMP`
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);
diff --git a/tests/cfgs/default/pcap/sites.pcapng b/tests/cfgs/default/pcap/sites.pcapng
index e959664b0..2ea236bb8 100644
--- a/tests/cfgs/default/pcap/sites.pcapng
+++ b/tests/cfgs/default/pcap/sites.pcapng
Binary files differ
diff --git a/tests/cfgs/default/result/sites.pcapng.out b/tests/cfgs/default/result/sites.pcapng.out
index 0d9ab7993..66d4d453b 100644
--- a/tests/cfgs/default/result/sites.pcapng.out
+++ b/tests/cfgs/default/result/sites.pcapng.out
@@ -1,19 +1,19 @@
Guessed flow protos: 4
-DPI Packets (TCP): 352 (5.50 pkts/flow)
+DPI Packets (TCP): 364 (5.43 pkts/flow)
DPI Packets (UDP): 6 (1.20 pkts/flow)
Confidence Match by port : 4 (flows)
-Confidence DPI : 65 (flows)
-Num dissector calls: 235 (3.41 diss/flow)
+Confidence DPI : 68 (flows)
+Num dissector calls: 251 (3.49 diss/flow)
LRU cache ookla: 0/0/0 (insert/search/found)
LRU cache bittorrent: 0/12/0 (insert/search/found)
LRU cache stun: 0/0/0 (insert/search/found)
LRU cache tls_cert: 0/8/0 (insert/search/found)
LRU cache mining: 0/4/0 (insert/search/found)
LRU cache msteams: 0/2/0 (insert/search/found)
-LRU cache fpc_dns: 0/64/0 (insert/search/found)
-Automa host: 99/65 (search/found)
-Automa domain: 99/0 (search/found)
+LRU cache fpc_dns: 0/67/0 (insert/search/found)
+Automa host: 102/68 (search/found)
+Automa domain: 102/0 (search/found)
Automa tls cert: 1/0 (search/found)
Automa risk mask: 1/0 (search/found)
Automa common alpns: 117/117 (search/found)
@@ -21,7 +21,7 @@ Patricia risk mask: 2/0 (search/found)
Patricia risk mask IPv6: 0/0 (search/found)
Patricia risk: 0/0 (search/found)
Patricia risk IPv6: 6/0 (search/found)
-Patricia protocols: 90/36 (search/found)
+Patricia protocols: 93/39 (search/found)
Patricia protocols IPv6: 7/5 (search/found)
HTTP 14 1040 4
@@ -38,7 +38,7 @@ Google 4 5596 2
LastFM 4 2215 1
Hulu 4 2245 1
FacebookMessenger 4 877 1
-UbuntuONE 4 2245 1
+Canonical 16 3964 4
Wikipedia 52 21182 1
eBay 4 2245 1
CNN 4 2245 1
@@ -77,7 +77,7 @@ Ubiquity 18 8375 1
Kick 8 4923 2
Safe 107 45378 8
-Acceptable 235 135830 26
+Acceptable 247 137549 29
Fun 482 310458 34
Potentially Dangerous 4 2225 1
@@ -91,8 +91,8 @@ JA Host Stats:
6 2001:b07:a3d:c112:c044:a6d4:80d:5d55 1
7 192.168.1.250 1
8 192.168.88.171 3
- 9 192.168.88.231 1
- 10 192.168.1.17 2
+ 9 192.168.1.17 4
+ 10 192.168.88.231 1
11 192.168.1.227 1
12 192.168.88.98 1
13 192.168.1.123 1
@@ -143,7 +143,7 @@ JA Host Stats:
40 TCP 192.168.88.171:49217 <-> 54.208.106.218:443 [proto: 91.59/TLS.AdobeConnect][IP: 265/AmazonAWS][Encrypted][Confidence: DPI][FPC: 265/AmazonAWS, Confidence: IP address][DPI packets: 6][cat: Video/26][3 pkts/691 bytes <-> 3 pkts/1620 bytes][Goodput ratio: 75/89][0.28 sec][Hostname/SNI: meet27083742.adobeconnect.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: GREASE;TLSv1.3;TLSv1.2][bytes ratio: -0.402 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 69/70 138/139 69/70][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 230/540 571/1494 241/675][TCP Fingerprint: 2_128_64240_6bb88f5575fd/Windows][TLSv1.3][JA4: t13d1516h2_8daaf6152771_e5627efa2ab1][JA3S: f4febc55ea12b31ae17cfb7e614afda8][Chrome][Cipher: TLS_AES_128_GCM_SHA256][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
41 TCP 192.168.88.171:55272 <-> 116.211.202.129:443 [proto: 91.54/TLS.iQIYI][IP: 0/Unknown][Encrypted][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 6][cat: Streaming/17][3 pkts/691 bytes <-> 3 pkts/1620 bytes][Goodput ratio: 75/89][0.59 sec][Hostname/SNI: opportunarch.iqiyi.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2;TLSv1.1;TLSv1][bytes ratio: -0.402 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 144/150 288/299 144/150][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 230/540 571/1494 241/675][TCP Fingerprint: 2_128_64240_6bb88f5575fd/Windows][TLSv1.3][JA4: t13d3113h2_e8f1e7e78f70_1b3407e2c936][JA3S: 15af977ce25de452b96affa2addb1036][Firefox][Cipher: TLS_AES_256_GCM_SHA384][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
42 TCP 192.168.1.128:40832 <-> 2.17.141.49:443 [proto: 91.179/TLS.eBay][IP: 0/Unknown][Encrypted][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 4][cat: Shopping/27][2 pkts/657 bytes <-> 2 pkts/1588 bytes][Goodput ratio: 79/91][0.04 sec][Hostname/SNI: www.ebay.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.3][JA4: t13d1715h2_5b57614c22b0_3d5424432f57][JA3S: 15af977ce25de452b96affa2addb1036][Firefox][Cipher: TLS_AES_256_GCM_SHA384][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
- 43 TCP 192.168.1.128:42884 <-> 185.125.190.21:443 [proto: 91.169/TLS.UbuntuONE][IP: 169/UbuntuONE][Encrypted][Confidence: DPI][FPC: 169/UbuntuONE, Confidence: IP address][DPI packets: 4][cat: Cloud/13][2 pkts/657 bytes <-> 2 pkts/1588 bytes][Goodput ratio: 79/91][0.06 sec][Hostname/SNI: assets.ubuntu.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.3][JA4: t13d1715h2_5b57614c22b0_3d5424432f57][JA3S: 15af977ce25de452b96affa2addb1036][Firefox][Cipher: TLS_AES_256_GCM_SHA384][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
+ 43 TCP 192.168.1.128:42884 <-> 185.125.190.21:443 [proto: 91.169/TLS.Canonical][IP: 169/Canonical][Encrypted][Confidence: DPI][FPC: 169/Canonical, Confidence: IP address][DPI packets: 4][cat: Cloud/13][2 pkts/657 bytes <-> 2 pkts/1588 bytes][Goodput ratio: 79/91][0.06 sec][Hostname/SNI: assets.ubuntu.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.3][JA4: t13d1715h2_5b57614c22b0_3d5424432f57][JA3S: 15af977ce25de452b96affa2addb1036][Firefox][Cipher: TLS_AES_256_GCM_SHA384][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
44 TCP 192.168.1.128:45898 <-> 15.160.39.187:443 [proto: 91.254/TLS.AppleSiri][IP: 265/AmazonAWS][Encrypted][Confidence: DPI][FPC: 265/AmazonAWS, Confidence: IP address][DPI packets: 4][cat: VirtAssistant/32][2 pkts/657 bytes <-> 2 pkts/1588 bytes][Goodput ratio: 79/91][0.02 sec][Hostname/SNI: guzzoni.apple.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.3][JA4: t13d1715h2_5b57614c22b0_3d5424432f57][JA3S: eb1d94daa7e0344597e756a1fb6e7054][Firefox][Cipher: TLS_AES_128_GCM_SHA256][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
45 TCP 192.168.1.128:46264 <-> 23.51.246.65:443 [proto: 91.231/TLS.Playstation][IP: 0/Unknown][Encrypted][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 4][cat: Game/8][2 pkts/657 bytes <-> 2 pkts/1588 bytes][Goodput ratio: 79/91][0.03 sec][Hostname/SNI: static.playstation.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.3][JA4: t13d1715h2_5b57614c22b0_3d5424432f57][JA3S: 15af977ce25de452b96affa2addb1036][Firefox][Cipher: TLS_AES_256_GCM_SHA384][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
46 TCP 192.168.1.128:48140 <-> 23.1.66.79:443 [proto: 91.180/TLS.CNN][IP: 0/Unknown][Encrypted][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 4][cat: Web/5][2 pkts/657 bytes <-> 2 pkts/1588 bytes][Goodput ratio: 79/91][0.04 sec][Hostname/SNI: cdn.cnn.com][(Advertised) ALPNs: h2;http/1.1][TLS Supported Versions: TLSv1.3;TLSv1.2][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.3][JA4: t13d1715h2_5b57614c22b0_3d5424432f57][JA3S: 15af977ce25de452b96affa2addb1036][Firefox][Cipher: TLS_AES_256_GCM_SHA384][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0]
@@ -166,7 +166,10 @@ JA Host Stats:
63 UDP [2001:b07:a3d:c112:6ea5:ab52:9230:ba5]:41590 -> [2a03:2880:f208:c4:face:b00c::43fe]:443 [proto: 188.413/QUIC.Threads][IP: 119/Facebook][Encrypted][Confidence: DPI][FPC: 188.413/QUIC.Threads, Confidence: DPI][DPI packets: 1][cat: SocialNetwork/6][1 pkts/1399 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Hostname/SNI: www.threads.net][(Advertised) ALPNs: h3][TLS Supported Versions: TLSv1.3][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][TLSv1.3][QUIC ver: V-1][JA4: q13d0314h0_55b375c5d22e_61e396c58b1f][ECH: version 0xfe0d][Firefox][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0]
64 UDP 192.168.1.123:59102 -> 216.58.209.46:443 [proto: 188.281/QUIC.GoogleClassroom][IP: 126/Google][Encrypted][Confidence: DPI][FPC: 188.281/QUIC.GoogleClassroom, Confidence: DPI][DPI packets: 1][cat: Collaborative/15][1 pkts/1292 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][< 1 sec][Hostname/SNI: classroom.google.com][(Advertised) ALPNs: h3][TLS Supported Versions: TLSv1.3][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][TLSv1.3][QUIC ver: V-1][JA4: q13d0310h0_55b375c5d22e_cd85d2d88918][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0]
65 TCP 192.168.12.169:46160 <-> 69.171.250.20:443 [proto: 91.157/TLS.FacebookMessenger][IP: 119/Facebook][Encrypted][Confidence: DPI][FPC: 119/Facebook, Confidence: IP address][DPI packets: 4][cat: Chat/9][2 pkts/521 bytes <-> 2 pkts/356 bytes][Goodput ratio: 73/61][0.02 sec][Hostname/SNI: edge-mqtt.facebook.com][(Advertised) ALPNs: h2;h2-fb][TLS Supported Versions: TLSv1.3;TLSv1.3 (Fizz)][TCP Fingerprint: 2_64_65535_685ad951a756/Android][TLSv1.3 (Fizz)][JA4: t00d0309h2_55b375c5d22e_2d3f7b9fe3d5][JA3S: fcb2d4d0991292272fcb1e464eedfd43][Cipher: TLS_AES_128_GCM_SHA256][Plen Bins: 0,0,0,0,0,0,50,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
- 66 TCP 192.168.1.128:39036 <-> 69.191.252.15:80 [proto: 7/HTTP][IP: 246/Bloomberg][ClearText][Confidence: Match by port][FPC: 246/Bloomberg, Confidence: IP address][DPI packets: 8][cat: Web/5][7 pkts/518 bytes <-> 1 pkts/78 bytes][Goodput ratio: 0/0][65.08 sec][bytes ratio: 0.738 (Upload)][IAT c2s/s2c min/avg/max/stddev: 1012/0 10830/0 33535/0 11329/0][Pkt Len c2s/s2c min/avg/max/stddev: 74/78 74/78 74/78 0/0][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
- 67 TCP 192.168.1.128:44954 <-> 34.96.123.111:80 [proto: 7/HTTP][IP: 284/GoogleCloud][ClearText][Confidence: Match by port][FPC: 284/GoogleCloud, Confidence: IP address][DPI packets: 2][cat: Web/5][1 pkts/74 bytes <-> 1 pkts/74 bytes][Goodput ratio: 0/0][0.01 sec][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
- 68 TCP 192.168.1.128:45936 <-> 208.85.40.158:80 [proto: 7/HTTP][IP: 0/Unknown][ClearText][Confidence: Match by port][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 2][cat: Web/5][1 pkts/74 bytes <-> 1 pkts/74 bytes][Goodput ratio: 0/0][0.17 sec][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
- 69 TCP 192.168.1.128:52070 <-> 18.65.82.67:80 [proto: 7/HTTP][IP: 265/AmazonAWS][ClearText][Confidence: Match by port][FPC: 265/AmazonAWS, Confidence: IP address][DPI packets: 2][cat: Web/5][1 pkts/74 bytes <-> 1 pkts/74 bytes][Goodput ratio: 0/0][0.02 sec][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 66 TCP 192.168.1.17:57042 <-> 185.125.190.80:443 [proto: 91.169/TLS.Canonical][IP: 169/Canonical][Encrypted][Confidence: DPI][FPC: 169/Canonical, Confidence: IP address][DPI packets: 4][cat: Cloud/13][3 pkts/608 bytes <-> 1 pkts/74 bytes][Goodput ratio: 66/0][< 1 sec][Hostname/SNI: ppa.launchpadcontent.net][TLS Supported Versions: TLSv1.3;TLSv1.2][Risk: ** TLS (probably) Not Carrying HTTPS **][Risk Score: 10][Risk Info: No ALPN][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.2][JA4: t13d291300_723694b0fccc_2cc26d266019][Firefox][PLAIN TEXT (ppa.launchpadcontent.net)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 67 TCP 192.168.1.128:39036 <-> 69.191.252.15:80 [proto: 7/HTTP][IP: 246/Bloomberg][ClearText][Confidence: Match by port][FPC: 246/Bloomberg, Confidence: IP address][DPI packets: 8][cat: Web/5][7 pkts/518 bytes <-> 1 pkts/78 bytes][Goodput ratio: 0/0][65.08 sec][bytes ratio: 0.738 (Upload)][IAT c2s/s2c min/avg/max/stddev: 1012/0 10830/0 33535/0 11329/0][Pkt Len c2s/s2c min/avg/max/stddev: 74/78 74/78 74/78 0/0][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 68 TCP 192.168.1.17:60888 <-> 185.125.188.54:443 [proto: 91.169/TLS.Canonical][IP: 169/Canonical][Encrypted][Confidence: DPI][FPC: 169/Canonical, Confidence: IP address][DPI packets: 4][cat: Cloud/13][3 pkts/474 bytes <-> 1 pkts/74 bytes][Goodput ratio: 56/0][0.05 sec][Hostname/SNI: api.snapcraft.io][TLS Supported Versions: TLSv1.3;TLSv1.2][Risk: ** TLS (probably) Not Carrying HTTPS **][Risk Score: 10][Risk Info: No ALPN][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][TLSv1.2][JA4: t13d191000_9dc949149365_e7c285222651][Firefox][PLAIN TEXT (api.snapcraft.io)][Plen Bins: 0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 69 TCP 192.168.1.17:55718 <-> 213.180.204.183:80 [proto: 7.169/HTTP.Canonical][IP: 25/Yandex][ClearText][Confidence: DPI][FPC: 25/Yandex, Confidence: IP address][DPI packets: 4][cat: Cloud/13][3 pkts/415 bytes <-> 1 pkts/74 bytes][Goodput ratio: 50/0][0.01 sec][Hostname/SNI: ru.archive.ubuntu.com][URL: ru.archive.ubuntu.com/ubuntu/dists/noble/InRelease][User-Agent: Debian APT-HTTP/1.3 (2.7.14)][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][PLAIN TEXT (GET /ubuntu/dists/noble/InRelea)][Plen Bins: 0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 70 TCP 192.168.1.128:44954 <-> 34.96.123.111:80 [proto: 7/HTTP][IP: 284/GoogleCloud][ClearText][Confidence: Match by port][FPC: 284/GoogleCloud, Confidence: IP address][DPI packets: 2][cat: Web/5][1 pkts/74 bytes <-> 1 pkts/74 bytes][Goodput ratio: 0/0][0.01 sec][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 71 TCP 192.168.1.128:45936 <-> 208.85.40.158:80 [proto: 7/HTTP][IP: 0/Unknown][ClearText][Confidence: Match by port][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 2][cat: Web/5][1 pkts/74 bytes <-> 1 pkts/74 bytes][Goodput ratio: 0/0][0.17 sec][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ 72 TCP 192.168.1.128:52070 <-> 18.65.82.67:80 [proto: 7/HTTP][IP: 265/AmazonAWS][ClearText][Confidence: Match by port][FPC: 265/AmazonAWS, Confidence: IP address][DPI packets: 2][cat: Web/5][1 pkts/74 bytes <-> 1 pkts/74 bytes][Goodput ratio: 0/0][0.02 sec][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
diff --git a/utils/asn_update.sh b/utils/asn_update.sh
index da89d7f89..a8263c246 100755
--- a/utils/asn_update.sh
+++ b/utils/asn_update.sh
@@ -99,10 +99,10 @@ DEST=../src/lib/inc_generated/ndpi_asn_blizzard.c.inc
create_list NDPI_PROTOCOL_BLIZZARD $DEST "" "AS57976" "AS32163"
echo "(3) Blizzard IPs are available in $DEST"
-echo "(1) Downloading UbuntuOne routes..." #Canonical
-DEST=../src/lib/inc_generated/ndpi_asn_ubuntuone.c.inc
-create_list NDPI_PROTOCOL_UBUNTUONE $DEST "" "AS41231" "AS11210"
-echo "(3) UbuntuOne IPs are available in $DEST"
+echo "(1) Downloading Canonical routes..." #Canonical
+DEST=../src/lib/inc_generated/ndpi_asn_canonical.c.inc
+create_list NDPI_PROTOCOL_CANONICAL $DEST "" "AS41231" "AS11210"
+echo "(3) Canonical IPs are available in $DEST"
echo "(1) Downloading Twitch routes..."
DEST=../src/lib/inc_generated/ndpi_asn_twitch.c.inc
Powered by cgit, Themed by Ted Yin.