Compare commits
8
Commits
dev
...
4.6-stable
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
683cdf2d36 | ||
|
|
4432e5b9e2 | ||
|
|
15801041fc | ||
|
|
4641516f3a | ||
|
|
29525fa396 | ||
|
|
5971fd79b4 | ||
|
|
56aade032e | ||
|
|
ab53497a40 |
+1
-1
@@ -1,4 +1,4 @@
|
||||
AC_INIT([libndpi],[4.5.0])
|
||||
AC_INIT([libndpi],[4.6.0])
|
||||
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
+77
-77
@@ -5088,116 +5088,116 @@ void zscoreUnitTest() {
|
||||
/**
|
||||
@brief MAIN FUNCTION
|
||||
**/
|
||||
int main(int argc, char **argv) {
|
||||
int i, skip_unit_tests = 0;
|
||||
int main(int argc, char **argv) {
|
||||
int i, skip_unit_tests = 0;
|
||||
|
||||
#ifdef DEBUG_TRACE
|
||||
trace = fopen("/tmp/ndpiReader.log", "a");
|
||||
trace = fopen("/tmp/ndpiReader.log", "a");
|
||||
|
||||
if(trace) {
|
||||
int i;
|
||||
if(trace) {
|
||||
int i;
|
||||
|
||||
fprintf(trace, " #### %s #### \n", __FUNCTION__);
|
||||
fprintf(trace, " #### [argc: %u] #### \n", argc);
|
||||
fprintf(trace, " #### %s #### \n", __FUNCTION__);
|
||||
fprintf(trace, " #### [argc: %u] #### \n", argc);
|
||||
|
||||
for(i=0; i<argc; i++)
|
||||
fprintf(trace, " #### [%d] [%s]\n", i, argv[i]);
|
||||
}
|
||||
for(i=0; i<argc; i++)
|
||||
fprintf(trace, " #### [%d] [%s]\n", i, argv[i]);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if(ndpi_get_api_version() != NDPI_API_VERSION) {
|
||||
printf("nDPI Library version mismatch: please make sure this code and the nDPI library are in sync\n");
|
||||
return(-1);
|
||||
}
|
||||
if(ndpi_get_api_version() != NDPI_API_VERSION) {
|
||||
printf("nDPI Library version mismatch: please make sure this code and the nDPI library are in sync\n");
|
||||
return(-1);
|
||||
}
|
||||
|
||||
if(!skip_unit_tests) {
|
||||
if(!skip_unit_tests) {
|
||||
#ifndef DEBUG_TRACE
|
||||
/* Skip tests when debugging */
|
||||
/* Skip tests when debugging */
|
||||
|
||||
#ifdef HW_TEST
|
||||
hwUnitTest2();
|
||||
hwUnitTest2();
|
||||
#endif
|
||||
|
||||
#ifdef STRESS_TEST
|
||||
desUnitStressTest();
|
||||
exit(0);
|
||||
desUnitStressTest();
|
||||
exit(0);
|
||||
#endif
|
||||
|
||||
zscoreUnitTest();
|
||||
sesUnitTest();
|
||||
desUnitTest();
|
||||
zscoreUnitTest();
|
||||
sesUnitTest();
|
||||
desUnitTest();
|
||||
|
||||
/* Internal checks */
|
||||
// binUnitTest();
|
||||
//hwUnitTest();
|
||||
jitterUnitTest();
|
||||
rsiUnitTest();
|
||||
hashUnitTest();
|
||||
dgaUnitTest();
|
||||
hllUnitTest();
|
||||
bitmapUnitTest();
|
||||
automataUnitTest();
|
||||
analyzeUnitTest();
|
||||
ndpi_self_check_host_match();
|
||||
analysisUnitTest();
|
||||
compressedBitmapUnitTest();
|
||||
/* Internal checks */
|
||||
// binUnitTest();
|
||||
//hwUnitTest();
|
||||
jitterUnitTest();
|
||||
rsiUnitTest();
|
||||
hashUnitTest();
|
||||
dgaUnitTest();
|
||||
hllUnitTest();
|
||||
bitmapUnitTest();
|
||||
automataUnitTest();
|
||||
analyzeUnitTest();
|
||||
ndpi_self_check_host_match();
|
||||
analysisUnitTest();
|
||||
compressedBitmapUnitTest();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
gettimeofday(&startup_time, NULL);
|
||||
memset(ndpi_thread_info, 0, sizeof(ndpi_thread_info));
|
||||
gettimeofday(&startup_time, NULL);
|
||||
memset(ndpi_thread_info, 0, sizeof(ndpi_thread_info));
|
||||
|
||||
if(getenv("AHO_DEBUG"))
|
||||
ac_automata_enable_debug(1);
|
||||
parseOptions(argc, argv);
|
||||
if(getenv("AHO_DEBUG"))
|
||||
ac_automata_enable_debug(1);
|
||||
parseOptions(argc, argv);
|
||||
|
||||
ndpi_info_mod = ndpi_init_detection_module(init_prefs);
|
||||
ndpi_info_mod = ndpi_init_detection_module(init_prefs);
|
||||
|
||||
if(ndpi_info_mod == NULL) return -1;
|
||||
if(ndpi_info_mod == NULL) return -1;
|
||||
|
||||
if(domain_to_check) {
|
||||
ndpiCheckHostStringMatch(domain_to_check);
|
||||
exit(0);
|
||||
}
|
||||
if(domain_to_check) {
|
||||
ndpiCheckHostStringMatch(domain_to_check);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
if(!quiet_mode) {
|
||||
printf("\n-----------------------------------------------------------\n"
|
||||
"* NOTE: This is demo app to show *some* nDPI features.\n"
|
||||
"* In this demo we have implemented only some basic features\n"
|
||||
"* just to show you what you can do with the library. Feel \n"
|
||||
"* free to extend it and send us the patches for inclusion\n"
|
||||
"------------------------------------------------------------\n\n");
|
||||
if(!quiet_mode) {
|
||||
printf("\n-----------------------------------------------------------\n"
|
||||
"* NOTE: This is demo app to show *some* nDPI features.\n"
|
||||
"* In this demo we have implemented only some basic features\n"
|
||||
"* just to show you what you can do with the library. Feel \n"
|
||||
"* free to extend it and send us the patches for inclusion\n"
|
||||
"------------------------------------------------------------\n\n");
|
||||
|
||||
printf("Using nDPI (%s) [%d thread(s)]\n", ndpi_revision(), num_threads);
|
||||
printf("Using nDPI (%s) [%d thread(s)]\n", ndpi_revision(), num_threads);
|
||||
|
||||
const char *gcrypt_ver = ndpi_get_gcrypt_version();
|
||||
if(gcrypt_ver)
|
||||
printf("Using libgcrypt version %s\n", gcrypt_ver);
|
||||
}
|
||||
const char *gcrypt_ver = ndpi_get_gcrypt_version();
|
||||
if(gcrypt_ver)
|
||||
printf("Using libgcrypt version %s\n", gcrypt_ver);
|
||||
}
|
||||
|
||||
signal(SIGINT, sigproc);
|
||||
signal(SIGINT, sigproc);
|
||||
|
||||
for(i=0; i<num_loops; i++)
|
||||
test_lib();
|
||||
for(i=0; i<num_loops; i++)
|
||||
test_lib();
|
||||
|
||||
if(results_path) ndpi_free(results_path);
|
||||
if(results_file) fclose(results_file);
|
||||
if(extcap_dumper) pcap_dump_close(extcap_dumper);
|
||||
if(extcap_fifo_h) pcap_close(extcap_fifo_h);
|
||||
if(ndpi_info_mod) ndpi_exit_detection_module(ndpi_info_mod);
|
||||
if(enable_malloc_bins)
|
||||
ndpi_free_bin(&malloc_bins);
|
||||
if(csv_fp) fclose(csv_fp);
|
||||
ndpi_free(_debug_protocols);
|
||||
ndpi_free(_disabled_protocols);
|
||||
if(results_path) ndpi_free(results_path);
|
||||
if(results_file) fclose(results_file);
|
||||
if(extcap_dumper) pcap_dump_close(extcap_dumper);
|
||||
if(extcap_fifo_h) pcap_close(extcap_fifo_h);
|
||||
if(ndpi_info_mod) ndpi_exit_detection_module(ndpi_info_mod);
|
||||
if(enable_malloc_bins)
|
||||
ndpi_free_bin(&malloc_bins);
|
||||
if(csv_fp) fclose(csv_fp);
|
||||
ndpi_free(_debug_protocols);
|
||||
ndpi_free(_disabled_protocols);
|
||||
|
||||
#ifdef DEBUG_TRACE
|
||||
if(trace) fclose(trace);
|
||||
if(trace) fclose(trace);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef _MSC_BUILD
|
||||
int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
|
||||
|
||||
@@ -64,16 +64,28 @@
|
||||
#ifndef _NDPI_PATRICIA_TYPEDEF_H_
|
||||
#define _NDPI_PATRICIA_TYPEDEF_H_
|
||||
|
||||
/* pointer to usr data (ex. route flap info) */
|
||||
#define UV16_MAX_USER_VALUES 2
|
||||
|
||||
struct patricia_uv16 {
|
||||
u_int16_t user_value, additional_user_value;
|
||||
};
|
||||
|
||||
struct patricia_uv16_list {
|
||||
struct patricia_uv16 value;
|
||||
struct patricia_uv16_list *next;
|
||||
};
|
||||
|
||||
struct patricia_uv32 {
|
||||
u_int32_t user_value, additional_user_value;
|
||||
};
|
||||
|
||||
/* pointer to user data (ex. route flap info) */
|
||||
union ndpi_patricia_node_value_t {
|
||||
/* User-defined values */
|
||||
union {
|
||||
struct {
|
||||
u_int32_t user_value, additional_user_value;
|
||||
} uv32;
|
||||
|
||||
u_int64_t uv64;
|
||||
|
||||
struct patricia_uv16 uv16[UV16_MAX_USER_VALUES];
|
||||
struct patricia_uv32 uv32;
|
||||
u_int64_t uv64;
|
||||
void *user_data;
|
||||
} u;
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* ndpi_typedefs.h
|
||||
*
|
||||
* Copyright (C) 2011-22 - ntop.org
|
||||
* Copyright (C) 2011-23 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
@@ -1160,18 +1160,18 @@ struct ndpi_detection_module_struct {
|
||||
risky_domain_automa, tls_cert_subject_automa,
|
||||
host_risk_mask_automa, common_alpns_automa;
|
||||
/* IMPORTANT: please, whenever you add a new automa:
|
||||
* update ndpi_finalize_initialization()
|
||||
* update automa_type above
|
||||
*/
|
||||
* update ndpi_finalize_initialization()
|
||||
* update automa_type above
|
||||
*/
|
||||
|
||||
ndpi_str_hash *malicious_ja3_hashmap, *malicious_sha1_hashmap;
|
||||
|
||||
ndpi_list *trusted_issuer_dn;
|
||||
|
||||
void *ip_risk_mask_ptree;
|
||||
void *ip_risk_ptree;
|
||||
/* IP-based protocol detection */
|
||||
void *protocols_ptree;
|
||||
|
||||
/* Patricia trees */
|
||||
ndpi_patricia_tree_t *ip_risk_mask_ptree;
|
||||
ndpi_patricia_tree_t *ip_risk_ptree;
|
||||
ndpi_patricia_tree_t *protocols_ptree; /* IP-based protocol detection */
|
||||
|
||||
/* *** If you add a new Patricia tree, please update ptree_type above! *** */
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -23,7 +23,7 @@
|
||||
static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
|
||||
{ 0x08D17A00 /* 8.209.122.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x08D3E400 /* 8.211.228.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x08D42000 /* 8.212.32.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x08D42000 /* 8.212.32.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x08D45D00 /* 8.212.93.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x08D46400 /* 8.212.100.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x08D4B800 /* 8.212.184.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
@@ -32,7 +32,6 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
|
||||
{ 0x0E017000 /* 14.1.112.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x2D5D1200 /* 45.93.18.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x2D869200 /* 45.134.146.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x2EC75800 /* 46.199.88.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x2F39C500 /* 47.57.197.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x2F5AAC00 /* 47.90.172.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x2FEB1100 /* 47.235.17.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
@@ -48,8 +47,9 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
|
||||
{ 0x2FFB8000 /* 47.251.128.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x3E3CE000 /* 62.60.224.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x67CE2800 /* 103.206.40.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x80006B00 /* 128.0.107.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0x938BFC00 /* 147.139.252.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0xA3B54500 /* 163.181.69.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0xA3B55700 /* 163.181.87.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0xAA210000 /* 170.33.0.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0xAA210800 /* 170.33.8.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
|
||||
{ 0xAA211000 /* 170.33.16.0/20 */, 20, NDPI_PROTOCOL_ALIBABA },
|
||||
|
||||
@@ -24,12 +24,9 @@ static ndpi_network ndpi_protocol_apple_protocol_list[] = {
|
||||
{ 0x11000000 /* 17.0.0.0/8 */, 8, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x39660000 /* 57.102.0.0/15 */, 15, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x39700000 /* 57.112.0.0/12 */, 12, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x3F5CE000 /* 63.92.224.0/19 */, 19, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x41C71600 /* 65.199.22.0/23 */, 23, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x8BB28000 /* 139.178.128.0/18 */, 18, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x90B20000 /* 144.178.0.0/19 */, 19, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x90B22000 /* 144.178.32.0/24 */, 24, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x90B23000 /* 144.178.48.0/20 */, 20, NDPI_PROTOCOL_APPLE },
|
||||
{ 0x90B20000 /* 144.178.0.0/18 */, 18, NDPI_PROTOCOL_APPLE },
|
||||
/* End */
|
||||
{ 0x0, 0, 0 }
|
||||
};
|
||||
|
||||
@@ -52,8 +52,6 @@ static ndpi_network ndpi_protocol_avast_protocol_list[] = {
|
||||
{ 0x9FF2EF00 /* 159.242.239.0/24 */, 24, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xB933E400 /* 185.51.228.0/23 */, 23, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xB933E600 /* 185.51.230.0/24 */, 24, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xB936E600 /* 185.54.230.0/24 */, 24, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xB9A74000 /* 185.167.64.0/24 */, 24, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xB9BD5C00 /* 185.189.92.0/22 */, 22, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xC2631C00 /* 194.99.28.0/22 */, 22, NDPI_PROTOCOL_AVAST },
|
||||
{ 0xC34A4C00 /* 195.74.76.0/24 */, 24, NDPI_PROTOCOL_AVAST },
|
||||
|
||||
@@ -28,13 +28,15 @@ static ndpi_network ndpi_protocol_bloomberg_protocol_list[] = {
|
||||
{ 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/23 */, 23, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BB2200 /* 69.187.34.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BB4900 /* 69.187.73.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BF5000 /* 69.191.80.0/21 */, 21, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BF8800 /* 69.191.136.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BF8800 /* 69.191.136.0/23 */, 23, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFB000 /* 69.191.176.0/21 */, 21, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFB800 /* 69.191.184.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFBA00 /* 69.191.186.0/23 */, 23, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFBC00 /* 69.191.188.0/22 */, 22, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFBC00 /* 69.191.188.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFBF00 /* 69.191.191.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFC000 /* 69.191.192.0/22 */, 22, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFC600 /* 69.191.198.0/23 */, 23, NDPI_PROTOCOL_BLOOMBERG },
|
||||
{ 0x45BFC800 /* 69.191.200.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
|
||||
|
||||
@@ -25,18 +25,18 @@ static ndpi_network ndpi_protocol_discord_protocol_list[] = {
|
||||
{ 0x1FCC8000 /* 31.204.128.0/19 */, 19, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x2BEF8800 /* 43.239.136.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x2D53C800 /* 45.83.200.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x2D54DA00 /* 45.84.218.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x2D55BD00 /* 45.85.189.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x2D7C8400 /* 45.124.132.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x2D935700 /* 45.147.87.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216C400 /* 66.22.196.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216C800 /* 66.22.200.0/21 */, 21, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216D000 /* 66.22.208.0/20 */, 20, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216E000 /* 66.22.224.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216E600 /* 66.22.230.0/23 */, 23, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216E800 /* 66.22.232.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216EC00 /* 66.22.236.0/23 */, 23, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216EE00 /* 66.22.238.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216E800 /* 66.22.232.0/21 */, 21, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216F000 /* 66.22.240.0/21 */, 21, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x4216F800 /* 66.22.248.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x45A8EA00 /* 69.168.234.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x559F7200 /* 85.159.114.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x5968A000 /* 89.104.160.0/21 */, 21, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0x5BC3EA00 /* 91.195.234.0/23 */, 23, NDPI_PROTOCOL_DISCORD },
|
||||
@@ -52,7 +52,6 @@ static ndpi_network ndpi_protocol_discord_protocol_list[] = {
|
||||
{ 0x92F74C00 /* 146.247.76.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xA2F43400 /* 162.244.52.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xA2F5CC00 /* 162.245.204.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xB2F89B00 /* 178.248.155.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xB9298C00 /* 185.41.140.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xB9326800 /* 185.50.104.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xB9340C00 /* 185.52.12.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
@@ -77,13 +76,16 @@ static ndpi_network ndpi_protocol_discord_protocol_list[] = {
|
||||
{ 0xC12BDA00 /* 193.43.218.0/23 */, 23, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xC12E5000 /* 193.46.80.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xC23D3B00 /* 194.61.59.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xC355E100 /* 195.85.225.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xC71BD400 /* 199.27.212.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xCB841000 /* 203.132.16.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xCB841800 /* 203.132.24.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD412E600 /* 212.18.230.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD413E000 /* 212.19.224.0/22 */, 22, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD468C800 /* 212.104.200.0/23 */, 23, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD468CA00 /* 212.104.202.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD468CC00 /* 212.104.204.0/23 */, 23, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD468CE00 /* 212.104.206.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD5A34000 /* 213.163.64.0/19 */, 19, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD5B3C000 /* 213.179.192.0/19 */, 19, NDPI_PROTOCOL_DISCORD },
|
||||
{ 0xD5BE1600 /* 213.190.22.0/24 */, 24, NDPI_PROTOCOL_DISCORD },
|
||||
|
||||
@@ -38,6 +38,7 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
|
||||
{ 0x400C4400 /* 64.12.68.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x400C4700 /* 64.12.71.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x400C4800 /* 64.12.72.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x400C4B00 /* 64.12.75.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x400C8000 /* 64.12.128.0/21 */, 21, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x400C8800 /* 64.12.136.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x400C8C00 /* 64.12.140.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
@@ -60,7 +61,7 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
|
||||
{ 0x44E82C00 /* 68.232.44.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x48155000 /* 72.21.80.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x48155400 /* 72.21.84.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x48155A00 /* 72.21.90.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x48155800 /* 72.21.88.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x48155C00 /* 72.21.92.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x48155E00 /* 72.21.94.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x5DB8D700 /* 93.184.215.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
@@ -86,7 +87,6 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
|
||||
{ 0x98C30B00 /* 152.195.11.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C30C00 /* 152.195.12.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C31000 /* 152.195.16.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C31500 /* 152.195.21.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C31600 /* 152.195.22.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C31900 /* 152.195.25.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C31A00 /* 152.195.26.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
@@ -117,7 +117,6 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
|
||||
{ 0x98C3DB00 /* 152.195.219.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C3DC00 /* 152.195.220.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C3DF00 /* 152.195.223.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C3E000 /* 152.195.224.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C3E400 /* 152.195.228.0/22 */, 22, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C3E800 /* 152.195.232.0/21 */, 21, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C3F000 /* 152.195.240.0/20 */, 20, NDPI_PROTOCOL_EDGECAST },
|
||||
@@ -137,7 +136,6 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
|
||||
{ 0x98C76000 /* 152.199.96.0/19 */, 19, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C79B00 /* 152.199.155.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0x98C7BF00 /* 152.199.191.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0100100 /* 192.16.1.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0100200 /* 192.16.2.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0100600 /* 192.16.6.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0100E00 /* 192.16.14.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
@@ -150,6 +148,7 @@ static ndpi_network ndpi_protocol_edgecast_protocol_list[] = {
|
||||
{ 0xC0102A00 /* 192.16.42.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0102E00 /* 192.16.46.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0103000 /* 192.16.48.0/21 */, 21, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0103800 /* 192.16.56.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0103A00 /* 192.16.58.0/23 */, 23, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0103C00 /* 192.16.60.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
{ 0xC0103F00 /* 192.16.63.0/24 */, 24, NDPI_PROTOCOL_EDGECAST },
|
||||
|
||||
@@ -29,11 +29,15 @@ static ndpi_network ndpi_protocol_facebook_protocol_list[] = {
|
||||
{ 0x45ABE000 /* 69.171.224.0/19 */, 19, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x4A774C00 /* 74.119.76.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66846000 /* 102.132.96.0/20 */, 20, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847000 /* 102.132.112.0/21 */, 21, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847000 /* 102.132.112.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847200 /* 102.132.114.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847400 /* 102.132.116.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847800 /* 102.132.120.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847A00 /* 102.132.122.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847C00 /* 102.132.124.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847A00 /* 102.132.122.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847D00 /* 102.132.125.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66847E00 /* 102.132.126.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66DDBC00 /* 102.221.188.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x66DDBF00 /* 102.221.191.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x67046000 /* 103.4.96.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x81860000 /* 129.134.0.0/17 */, 17, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x81868000 /* 129.134.128.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
@@ -54,22 +58,24 @@ static ndpi_network ndpi_protocol_facebook_protocol_list[] = {
|
||||
{ 0x8186A400 /* 129.134.164.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x8186A800 /* 129.134.168.0/21 */, 21, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x8186B000 /* 129.134.176.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x8186B800 /* 129.134.184.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF00000 /* 157.240.0.0/17 */, 17, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF08000 /* 157.240.128.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF09C00 /* 157.240.156.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF09F00 /* 157.240.159.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0AC00 /* 157.240.172.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0AE00 /* 157.240.174.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0B000 /* 157.240.176.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0B300 /* 157.240.179.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0B400 /* 157.240.180.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0B500 /* 157.240.181.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0B600 /* 157.240.182.0/24 */, 24, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0x9DF0C000 /* 157.240.192.0/18 */, 18, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xA3468000 /* 163.70.128.0/17 */, 17, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xA3728000 /* 163.114.128.0/20 */, 20, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xADFC4000 /* 173.252.64.0/18 */, 18, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xB33CC000 /* 179.60.192.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xB93CD800 /* 185.60.216.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xB959DA00 /* 185.89.218.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xC4314400 /* 196.49.68.0/23 */, 23, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xC7C94000 /* 199.201.64.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
{ 0xCC0F1400 /* 204.15.20.0/22 */, 22, NDPI_PROTOCOL_FACEBOOK },
|
||||
/* End */
|
||||
|
||||
@@ -28,14 +28,15 @@ static ndpi_network ndpi_protocol_opendns_protocol_list[] = {
|
||||
{ 0x43D74900 /* 67.215.73.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D74B00 /* 67.215.75.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D74C00 /* 67.215.76.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75000 /* 67.215.80.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75200 /* 67.215.82.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75000 /* 67.215.80.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75400 /* 67.215.84.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75600 /* 67.215.86.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75800 /* 67.215.88.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75A00 /* 67.215.90.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75C00 /* 67.215.92.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75E00 /* 67.215.94.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x43D75E00 /* 67.215.94.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x6CAB8000 /* 108.171.128.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x6CAB8200 /* 108.171.130.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92700000 /* 146.112.0.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92700800 /* 146.112.8.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92700B00 /* 146.112.11.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
@@ -44,8 +45,7 @@ static ndpi_network ndpi_protocol_opendns_protocol_list[] = {
|
||||
{ 0x92701000 /* 146.112.16.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701200 /* 146.112.18.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701400 /* 146.112.20.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701800 /* 146.112.24.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701A00 /* 146.112.26.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701800 /* 146.112.24.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701C00 /* 146.112.28.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92701F00 /* 146.112.31.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x92702100 /* 146.112.33.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
@@ -69,6 +69,7 @@ static ndpi_network ndpi_protocol_opendns_protocol_list[] = {
|
||||
{ 0x9270A000 /* 146.112.160.0/20 */, 20, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270B000 /* 146.112.176.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270B800 /* 146.112.184.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270BC00 /* 146.112.188.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270BE00 /* 146.112.190.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270C000 /* 146.112.192.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270C800 /* 146.112.200.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
@@ -83,53 +84,59 @@ static ndpi_network ndpi_protocol_opendns_protocol_list[] = {
|
||||
{ 0x9270DD00 /* 146.112.221.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270DE00 /* 146.112.222.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9270E000 /* 146.112.224.0/19 */, 19, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0300 /* 151.186.3.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0500 /* 151.186.5.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0600 /* 151.186.6.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0000 /* 151.186.0.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0800 /* 151.186.8.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0A00 /* 151.186.10.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0C00 /* 151.186.12.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x97BA0F00 /* 151.186.15.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE0000 /* 155.190.0.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE0600 /* 155.190.6.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE0800 /* 155.190.8.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE0A00 /* 155.190.10.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE0D00 /* 155.190.13.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE0F00 /* 155.190.15.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1100 /* 155.190.17.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1200 /* 155.190.18.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1400 /* 155.190.20.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1600 /* 155.190.22.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1400 /* 155.190.20.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1800 /* 155.190.24.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE1C00 /* 155.190.28.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE2100 /* 155.190.33.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE2200 /* 155.190.34.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE2400 /* 155.190.36.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE2000 /* 155.190.32.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE2A00 /* 155.190.42.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE2C00 /* 155.190.44.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE3000 /* 155.190.48.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE3500 /* 155.190.53.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE3600 /* 155.190.54.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE3000 /* 155.190.48.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE3800 /* 155.190.56.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE4200 /* 155.190.66.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE4400 /* 155.190.68.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE4600 /* 155.190.70.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE5300 /* 155.190.83.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE5400 /* 155.190.84.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE5700 /* 155.190.87.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE5800 /* 155.190.88.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE7300 /* 155.190.115.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE7400 /* 155.190.116.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE8000 /* 155.190.128.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE8800 /* 155.190.136.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE8C00 /* 155.190.140.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE8C00 /* 155.190.140.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBE8F00 /* 155.190.143.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 },
|
||||
{ 0x9BBEC000 /* 155.190.192.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEC400 /* 155.190.196.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEC600 /* 155.190.198.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEC800 /* 155.190.200.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBECA00 /* 155.190.202.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBECC00 /* 155.190.204.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEC800 /* 155.190.200.0/21 */, 21, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBED000 /* 155.190.208.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBED300 /* 155.190.211.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBED400 /* 155.190.212.0/22 */, 22, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEDA00 /* 155.190.218.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEDD00 /* 155.190.221.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEDF00 /* 155.190.223.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEE000 /* 155.190.224.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEE200 /* 155.190.226.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEE500 /* 155.190.229.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEE800 /* 155.190.232.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEE400 /* 155.190.228.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEE800 /* 155.190.232.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEEE00 /* 155.190.238.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEF100 /* 155.190.241.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEF300 /* 155.190.243.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEF600 /* 155.190.246.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEF800 /* 155.190.248.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEFA00 /* 155.190.250.0/23 */, 23, NDPI_PROTOCOL_OPENDNS },
|
||||
{ 0x9BBEFE00 /* 155.190.254.0/24 */, 24, NDPI_PROTOCOL_OPENDNS },
|
||||
|
||||
@@ -25,7 +25,7 @@ static ndpi_network ndpi_protocol_riotgames_protocol_list[] = {
|
||||
{ 0x2D072400 /* 45.7.36.0/23 */, 23, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x2D072700 /* 45.7.39.0/24 */, 24, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x2DFAD000 /* 45.250.208.0/22 */, 22, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x67DB8000 /* 103.219.128.0/24 */, 24, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x67DB8000 /* 103.219.128.0/22 */, 22, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x67F0E000 /* 103.240.224.0/22 */, 22, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x68A08000 /* 104.160.128.0/19 */, 19, NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ 0x8A000C00 /* 138.0.12.0/22 */, 22, NDPI_PROTOCOL_RIOTGAMES },
|
||||
|
||||
@@ -36,6 +36,10 @@ static ndpi_network ndpi_protocol_starcraft_protocol_list[] = {
|
||||
{ 0x25F43400 /* 37.244.52.0/22 */, 22, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x25F43800 /* 37.244.56.0/21 */, 21, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x3B992800 /* 59.153.40.0/23 */, 23, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x40E01A00 /* 64.224.26.0/23 */, 23, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x40E01C00 /* 64.224.28.0/22 */, 22, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x4228B800 /* 66.40.184.0/24 */, 24, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x4228BE00 /* 66.40.190.0/24 */, 24, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x67C62000 /* 103.198.32.0/23 */, 23, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x6E2DD000 /* 110.45.208.0/24 */, 24, NDPI_PROTOCOL_STARCRAFT },
|
||||
{ 0x75340600 /* 117.52.6.0/24 */, 24, NDPI_PROTOCOL_STARCRAFT },
|
||||
|
||||
@@ -33,7 +33,7 @@ static ndpi_network ndpi_protocol_steam_protocol_list[] = {
|
||||
{ 0x9B85EC00 /* 155.133.236.0/22 */, 22, NDPI_PROTOCOL_STEAM },
|
||||
{ 0x9B85F000 /* 155.133.240.0/23 */, 23, NDPI_PROTOCOL_STEAM },
|
||||
{ 0x9B85F500 /* 155.133.245.0/24 */, 24, NDPI_PROTOCOL_STEAM },
|
||||
{ 0x9B85F600 /* 155.133.246.0/23 */, 23, NDPI_PROTOCOL_STEAM },
|
||||
{ 0x9B85F600 /* 155.133.246.0/24 */, 24, NDPI_PROTOCOL_STEAM },
|
||||
{ 0x9B85F800 /* 155.133.248.0/21 */, 21, NDPI_PROTOCOL_STEAM },
|
||||
{ 0xA2FEC000 /* 162.254.192.0/21 */, 21, NDPI_PROTOCOL_STEAM },
|
||||
{ 0xB919B600 /* 185.25.182.0/23 */, 23, NDPI_PROTOCOL_STEAM },
|
||||
|
||||
@@ -35,9 +35,6 @@ static ndpi_network ndpi_protocol_tencent_protocol_list[] = {
|
||||
{ 0x2B83C000 /* 43.131.192.0/18 */, 18, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B840000 /* 43.132.0.0/18 */, 18, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B844400 /* 43.132.68.0/24 */, 24, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B844600 /* 43.132.70.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B845400 /* 43.132.84.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B845E00 /* 43.132.94.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B846000 /* 43.132.96.0/19 */, 19, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B848000 /* 43.132.128.0/17 */, 17, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2B850000 /* 43.133.0.0/16 */, 16, NDPI_PROTOCOL_TENCENT },
|
||||
@@ -61,7 +58,6 @@ static ndpi_network ndpi_protocol_tencent_protocol_list[] = {
|
||||
{ 0x2BA20000 /* 43.162.0.0/16 */, 16, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2BA3C000 /* 43.163.192.0/18 */, 18, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2BAC0F00 /* 43.172.15.0/24 */, 24, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2BAF1000 /* 43.175.16.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2BF2FC00 /* 43.242.252.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2BF7C400 /* 43.247.196.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x2D28C000 /* 45.40.192.0/18 */, 18, NDPI_PROTOCOL_TENCENT },
|
||||
@@ -94,7 +90,6 @@ static ndpi_network ndpi_protocol_tencent_protocol_list[] = {
|
||||
{ 0x65210E00 /* 101.33.14.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x65211100 /* 101.33.17.0/24 */, 24, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x65211200 /* 101.33.18.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x65211400 /* 101.33.20.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x65211A00 /* 101.33.26.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x65211E00 /* 101.33.30.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0x65212000 /* 101.33.32.0/19 */, 19, NDPI_PROTOCOL_TENCENT },
|
||||
@@ -196,10 +191,8 @@ static ndpi_network ndpi_protocol_tencent_protocol_list[] = {
|
||||
{ 0xD3385C00 /* 211.56.92.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3988000 /* 211.152.128.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3988400 /* 211.152.132.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3988A00 /* 211.152.138.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3989000 /* 211.152.144.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3989400 /* 211.152.148.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3989800 /* 211.152.152.0/22 */, 22, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3989A00 /* 211.152.154.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD3989E00 /* 211.152.158.0/23 */, 23, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD39F8000 /* 211.159.128.0/17 */, 17, NDPI_PROTOCOL_TENCENT },
|
||||
{ 0xD4400000 /* 212.64.0.0/17 */, 17, NDPI_PROTOCOL_TENCENT },
|
||||
|
||||
@@ -25,16 +25,7 @@ static ndpi_network ndpi_protocol_twitter_protocol_list[] = {
|
||||
{ 0x0819C400 /* 8.25.196.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x403F0000 /* 64.63.0.0/18 */, 18, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x450C3800 /* 69.12.56.0/21 */, 21, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3A000 /* 69.195.160.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3A200 /* 69.195.162.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3A400 /* 69.195.164.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3A600 /* 69.195.166.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3A800 /* 69.195.168.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3AB00 /* 69.195.171.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3AC00 /* 69.195.172.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3AE00 /* 69.195.174.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3B000 /* 69.195.176.0/21 */, 21, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3B800 /* 69.195.184.0/22 */, 22, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x45C3A000 /* 69.195.160.0/19 */, 19, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x67FC7000 /* 103.252.112.0/22 */, 22, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x68F42800 /* 104.244.40.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0x68F42A00 /* 104.244.42.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
@@ -48,12 +39,7 @@ static ndpi_network ndpi_protocol_twitter_protocol_list[] = {
|
||||
{ 0xC73B9400 /* 199.59.148.0/22 */, 22, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xC7603800 /* 199.96.56.0/21 */, 21, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xCAA08000 /* 202.160.128.0/22 */, 22, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDC000 /* 209.237.192.0/21 */, 21, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDC800 /* 209.237.200.0/22 */, 22, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDCC00 /* 209.237.204.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDDB00 /* 209.237.219.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDDC00 /* 209.237.220.0/23 */, 23, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDDE00 /* 209.237.222.0/24 */, 24, NDPI_PROTOCOL_TWITTER },
|
||||
{ 0xD1EDC000 /* 209.237.192.0/19 */, 19, NDPI_PROTOCOL_TWITTER },
|
||||
/* End */
|
||||
{ 0x0, 0, 0 }
|
||||
};
|
||||
|
||||
@@ -21,8 +21,7 @@
|
||||
|
||||
|
||||
static ndpi_network ndpi_protocol_ubuntuone_protocol_list[] = {
|
||||
{ 0x5BBD5800 /* 91.189.88.0/24 */, 24, NDPI_PROTOCOL_UBUNTUONE },
|
||||
{ 0x5BBD5A00 /* 91.189.90.0/23 */, 23, NDPI_PROTOCOL_UBUNTUONE },
|
||||
{ 0x5BBD5800 /* 91.189.88.0/22 */, 22, NDPI_PROTOCOL_UBUNTUONE },
|
||||
{ 0x5BBD5C00 /* 91.189.92.0/23 */, 23, NDPI_PROTOCOL_UBUNTUONE },
|
||||
{ 0x5BBD5E00 /* 91.189.94.0/24 */, 24, NDPI_PROTOCOL_UBUNTUONE },
|
||||
{ 0xA2D52000 /* 162.213.32.0/22 */, 22, NDPI_PROTOCOL_UBUNTUONE },
|
||||
|
||||
@@ -35,6 +35,9 @@ static ndpi_network ndpi_protocol_webex_protocol_list[] = {
|
||||
{ 0x721DC000 /* 114.29.192.0/19 */, 19, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0x8BB15800 /* 139.177.88.0/22 */, 22, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0x8BB15C00 /* 139.177.92.0/23 */, 23, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0x90C40000 /* 144.196.0.0/18 */, 18, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0x90C44000 /* 144.196.64.0/19 */, 19, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0x90C46000 /* 144.196.96.0/20 */, 20, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0x96FD8000 /* 150.253.128.0/17 */, 17, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0xAA480000 /* 170.72.0.0/17 */, 17, NDPI_PROTOCOL_WEBEX },
|
||||
{ 0xAA488000 /* 170.72.128.0/18 */, 18, NDPI_PROTOCOL_WEBEX },
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -23,20 +23,14 @@
|
||||
static ndpi_network ndpi_protocol_mining_protocol_list[] = {
|
||||
{ 0x128A6C43 /* 18.138.108.67/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x03D12D4F /* 3.209.45.79/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34BBCF1B /* 52.187.207.27/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0xBFEAA2C6 /* 191.234.162.198/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34E7A56C /* 52.231.165.108/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x682AD919 /* 104.42.217.25/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x416C4665 /* 65.108.70.101/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x9D5A23A6 /* 157.90.35.166/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34B0070A /* 52.176.7.10/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34B0644D /* 52.176.100.77/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34E8F398 /* 52.232.243.152/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0xC051D0DF /* 192.81.208.223/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x12A8B656 /* 18.168.182.86/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x340E97B1 /* 52.14.151.177/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x8AC533B5 /* 138.197.51.181/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x92BE0167 /* 146.190.1.103/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0xAA40FA58 /* 170.64.250.88/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x8B3B31CE /* 139.59.49.206/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x8A447B98 /* 138.68.123.152/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34A92A65 /* 52.169.42.101/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x34039EB8 /* 52.3.158.184/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x9F591CD3 /* 159.89.28.211/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x338D4E35 /* 51.141.78.53/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
{ 0x0D5D3689 /* 13.93.54.137/32 */, 32, NDPI_PROTOCOL_MINING },
|
||||
|
||||
@@ -87,6 +87,9 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23DC2D00 /* 35.220.45.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F22D00 /* 35.242.45.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F33800 /* 35.243.56.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22006000 /* 34.0.96.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22164000 /* 34.22.64.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22166000 /* 34.22.96.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22402000 /* 34.64.32.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22404000 /* 34.64.64.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22404400 /* 34.64.68.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -104,8 +107,10 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x22648000 /* 34.100.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22686C00 /* 34.104.108.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227C2C00 /* 34.124.44.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22984000 /* 34.152.64.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D5700 /* 34.157.87.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DD700 /* 34.157.215.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22B12000 /* 34.177.32.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23C88000 /* 35.200.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23C92900 /* 35.201.41.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23CFC000 /* 35.207.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -113,6 +118,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23EAD000 /* 35.234.208.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F22A00 /* 35.242.42.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F40000 /* 35.244.0.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22000000 /* 34.0.0.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22687800 /* 34.104.120.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227C3800 /* 34.124.56.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227ED000 /* 34.126.208.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -149,6 +155,8 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x22654000 /* 34.101.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22658000 /* 34.101.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22804000 /* 34.128.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22984400 /* 34.152.68.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DFE00 /* 34.157.254.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23DB0000 /* 35.219.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x2257C000 /* 34.87.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22686800 /* 34.104.104.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -164,6 +172,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23EAE000 /* 35.234.224.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F22900 /* 35.242.41.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F44000 /* 35.244.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22001000 /* 34.0.16.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22687A00 /* 34.104.122.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227C3A00 /* 34.124.58.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227EC000 /* 34.126.192.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -180,6 +189,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23DC1A00 /* 35.220.26.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23E40000 /* 35.228.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F21A00 /* 35.242.26.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x2200C000 /* 34.0.192.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D2C00 /* 34.157.44.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DAC00 /* 34.157.172.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22A40000 /* 34.164.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -188,6 +198,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x0822D300 /* 8.34.211.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x0822DC00 /* 8.34.220.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x17FB8000 /* 23.251.128.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22167000 /* 34.22.112.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22168000 /* 34.22.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x224C0000 /* 34.76.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x2276FE00 /* 34.118.254.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -221,6 +232,9 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x92941000 /* 146.148.16.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x92947000 /* 146.148.112.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0xC09E1C00 /* 192.158.28.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22110000 /* 34.17.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D7C00 /* 34.157.124.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DFA00 /* 34.157.250.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22590000 /* 34.89.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22698000 /* 34.105.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227FBA00 /* 34.127.186.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -242,6 +256,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23F21400 /* 35.242.20.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F28000 /* 35.242.128.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F60000 /* 35.246.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x2200E000 /* 34.0.224.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22598000 /* 34.89.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22687000 /* 34.104.112.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x226B0000 /* 34.107.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -261,6 +276,8 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23F21200 /* 35.242.18.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F2C000 /* 35.242.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F68000 /* 35.246.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22208000 /* 34.32.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22220000 /* 34.34.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x225A0000 /* 34.90.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22687E00 /* 34.104.126.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227C3E00 /* 34.124.62.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -282,14 +299,18 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23DC2C00 /* 35.220.44.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23EBD800 /* 35.235.216.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F22C00 /* 35.242.44.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x2200A000 /* 34.0.160.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229A0000 /* 34.154.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D0800 /* 34.157.8.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D7900 /* 34.157.121.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D8800 /* 34.157.136.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DF900 /* 34.157.249.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23DBE000 /* 35.219.224.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229B0000 /* 34.155.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D0C00 /* 34.157.12.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D8C00 /* 34.157.140.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22A30000 /* 34.163.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22240000 /* 34.36.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x225F4000 /* 34.95.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22604000 /* 34.96.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22624000 /* 34.98.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -318,6 +339,9 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x82D30800 /* 130.211.8.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x82D31000 /* 130.211.16.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x82D32000 /* 130.211.32.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22120000 /* 34.18.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D7E00 /* 34.157.126.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DFC00 /* 34.157.252.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22004000 /* 34.0.64.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D5A00 /* 34.157.90.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DD800 /* 34.157.216.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -339,6 +363,8 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x227C3200 /* 34.124.50.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227C7000 /* 34.124.112.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22820000 /* 34.130.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22984500 /* 34.152.69.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DFF00 /* 34.157.255.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x225F8000 /* 34.95.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22685000 /* 34.104.80.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227C1000 /* 34.124.16.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -351,6 +377,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x23EB0000 /* 35.235.0.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F22800 /* 35.242.40.0/24 */, 24, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23F7C000 /* 35.247.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22003000 /* 34.0.48.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22683200 /* 34.104.50.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227FB200 /* 34.127.178.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22B00000 /* 34.176.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -362,14 +389,15 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x17FB9000 /* 23.251.144.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22100000 /* 34.16.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x221B0000 /* 34.27.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x221C0000 /* 34.28.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x221E0000 /* 34.30.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x221C0000 /* 34.28.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22210000 /* 34.33.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22420000 /* 34.66.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22440000 /* 34.68.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22480000 /* 34.72.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x2276C800 /* 34.118.200.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22790000 /* 34.121.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x227A0000 /* 34.122.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22802000 /* 34.128.32.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22840000 /* 34.132.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22880000 /* 34.136.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D5400 /* 34.157.84.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -378,6 +406,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x229DE000 /* 34.157.224.0/20 */, 20, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22AA0000 /* 34.170.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22AC0000 /* 34.172.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22B13400 /* 34.177.52.0/22 */, 22, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23B80000 /* 35.184.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23BC0000 /* 35.188.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23BC8000 /* 35.188.128.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -441,6 +470,8 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x2276FA00 /* 34.118.250.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x228A0000 /* 34.138.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22940000 /* 34.148.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22984800 /* 34.152.72.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22B12800 /* 34.177.40.0/21 */, 21, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23B90000 /* 35.185.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23BE8000 /* 35.190.128.0/18 */, 18, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23C40000 /* 35.196.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
@@ -497,6 +528,7 @@ static ndpi_network ndpi_protocol_google_cloud_protocol_list[] = {
|
||||
{ 0x227FB800 /* 34.127.184.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22A10000 /* 34.161.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x23CE0A00 /* 35.206.10.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22008000 /* 34.0.128.0/19 */, 19, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229D2E00 /* 34.157.46.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x229DAE00 /* 34.157.174.0/23 */, 23, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
{ 0x22AE0000 /* 34.174.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE_CLOUD },
|
||||
|
||||
@@ -24,10 +24,11 @@ static ndpi_network ndpi_protocol_google_protocol_list[] = {
|
||||
{ 0x08080400 /* 8.8.4.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x08080800 /* 8.8.8.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x0823C800 /* 8.35.200.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22000000 /* 34.0.0.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22003000 /* 34.0.48.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22006000 /* 34.0.96.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22008000 /* 34.0.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x2200E100 /* 34.0.225.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x2200E200 /* 34.0.226.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x2200E400 /* 34.0.228.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x2200E800 /* 34.0.232.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x2200F000 /* 34.0.240.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22010000 /* 34.1.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22020000 /* 34.2.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22030000 /* 34.3.0.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
@@ -40,11 +41,13 @@ static ndpi_network ndpi_protocol_google_protocol_list[] = {
|
||||
{ 0x22038000 /* 34.3.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22040000 /* 34.4.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22080000 /* 34.8.0.0/13 */, 13, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22110000 /* 34.17.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22120000 /* 34.18.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22164000 /* 34.22.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x221F0000 /* 34.31.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22200000 /* 34.32.0.0/11 */, 11, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22200000 /* 34.32.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22228000 /* 34.34.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22230000 /* 34.35.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22250000 /* 34.37.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22260000 /* 34.38.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22280000 /* 34.40.0.0/13 */, 13, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22300000 /* 34.48.0.0/12 */, 12, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22400000 /* 34.64.0.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22600000 /* 34.96.0.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22620000 /* 34.98.0.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
@@ -87,25 +90,36 @@ static ndpi_network ndpi_protocol_google_protocol_list[] = {
|
||||
{ 0x227FB500 /* 34.127.181.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x227FB600 /* 34.127.182.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x227FC000 /* 34.127.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22800000 /* 34.128.0.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22800000 /* 34.128.0.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22802400 /* 34.128.36.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22802800 /* 34.128.40.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22803000 /* 34.128.48.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x2280C000 /* 34.128.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x228F0000 /* 34.143.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22900000 /* 34.144.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22908000 /* 34.144.128.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22984000 /* 34.152.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22984600 /* 34.152.70.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22985000 /* 34.152.80.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22986000 /* 34.152.96.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22988000 /* 34.152.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22990000 /* 34.153.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229C0000 /* 34.156.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229D0A00 /* 34.157.10.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229D5600 /* 34.157.86.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229D7800 /* 34.157.120.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229D7800 /* 34.157.120.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229D7A00 /* 34.157.122.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229D8A00 /* 34.157.138.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229DD600 /* 34.157.214.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229DDA00 /* 34.157.218.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229DF800 /* 34.157.248.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229DF800 /* 34.157.248.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x229E0000 /* 34.158.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22A60000 /* 34.166.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B10000 /* 34.177.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B10000 /* 34.177.0.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B12400 /* 34.177.36.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B13000 /* 34.177.48.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B13800 /* 34.177.56.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B14000 /* 34.177.64.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B18000 /* 34.177.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B20000 /* 34.178.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B40000 /* 34.180.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE },
|
||||
{ 0x22B80000 /* 34.184.0.0/13 */, 13, NDPI_PROTOCOL_GOOGLE },
|
||||
|
||||
@@ -21,44 +21,7 @@
|
||||
|
||||
|
||||
static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x081B4317 /* 8.27.67.23/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B431F /* 8.27.67.31/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4320 /* 8.27.67.32/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4329 /* 8.27.67.41/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B432A /* 8.27.67.42/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B432C /* 8.27.67.44/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4333 /* 8.27.67.51/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4334 /* 8.27.67.52/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4336 /* 8.27.67.54/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4339 /* 8.27.67.57/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B433A /* 8.27.67.58/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B433D /* 8.27.67.61/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B433F /* 8.27.67.63/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B434A /* 8.27.67.74/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B434D /* 8.27.67.77/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B434E /* 8.27.67.78/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4359 /* 8.27.67.89/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4362 /* 8.27.67.98/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4364 /* 8.27.67.100/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B436D /* 8.27.67.109/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4376 /* 8.27.67.118/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4378 /* 8.27.67.120/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4382 /* 8.27.67.130/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B438A /* 8.27.67.138/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B438D /* 8.27.67.141/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B438F /* 8.27.67.143/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B4392 /* 8.27.67.146/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43A4 /* 8.27.67.164/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43A9 /* 8.27.67.169/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43AD /* 8.27.67.173/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43BC /* 8.27.67.188/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43BE /* 8.27.67.190/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43CB /* 8.27.67.203/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43D2 /* 8.27.67.210/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43D4 /* 8.27.67.212/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43E4 /* 8.27.67.228/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43F3 /* 8.27.67.243/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x081B43F5 /* 8.27.67.245/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x42424242 /* 66.66.66.66/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0801 /* 104.28.8.1/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0802 /* 104.28.8.2/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0804 /* 104.28.8.4/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -71,11 +34,20 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x681C0A00 /* 104.28.10.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0C00 /* 104.28.12.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0E00 /* 104.28.14.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F00 /* 104.28.15.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F40 /* 104.28.15.64/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F60 /* 104.28.15.96/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F70 /* 104.28.15.112/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F78 /* 104.28.15.120/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F00 /* 104.28.15.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0F80 /* 104.28.15.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0FC0 /* 104.28.15.192/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0FE0 /* 104.28.15.224/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0FF0 /* 104.28.15.240/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0FF8 /* 104.28.15.248/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0FFC /* 104.28.15.252/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C0FFE /* 104.28.15.254/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1001 /* 104.28.16.1/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1002 /* 104.28.16.2/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1004 /* 104.28.16.4/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1008 /* 104.28.16.8/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1010 /* 104.28.16.16/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1020 /* 104.28.16.32/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1C00 /* 104.28.28.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1C40 /* 104.28.28.64/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C1C48 /* 104.28.28.72/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1779,6 +1751,16 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x681C8700 /* 104.28.135.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8740 /* 104.28.135.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8750 /* 104.28.135.80/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C01 /* 104.28.140.1/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C02 /* 104.28.140.2/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C04 /* 104.28.140.4/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C08 /* 104.28.140.8/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C10 /* 104.28.140.16/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C20 /* 104.28.140.32/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C40 /* 104.28.140.64/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8C80 /* 104.28.140.128/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8CA0 /* 104.28.140.160/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C8CB0 /* 104.28.140.176/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9001 /* 104.28.144.1/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9002 /* 104.28.144.2/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9004 /* 104.28.144.4/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1834,11 +1816,21 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x681C9610 /* 104.28.150.16/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9620 /* 104.28.150.32/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9640 /* 104.28.150.64/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9680 /* 104.28.150.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C96C0 /* 104.28.150.192/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C96E0 /* 104.28.150.224/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C96E8 /* 104.28.150.232/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C96EA /* 104.28.150.234/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9680 /* 104.28.150.128/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9701 /* 104.28.151.1/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9702 /* 104.28.151.2/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9704 /* 104.28.151.4/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9708 /* 104.28.151.8/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9710 /* 104.28.151.16/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9720 /* 104.28.151.32/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9740 /* 104.28.151.64/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C9780 /* 104.28.151.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C97C0 /* 104.28.151.192/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C97E0 /* 104.28.151.224/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C97F0 /* 104.28.151.240/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C97F8 /* 104.28.151.248/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C97FC /* 104.28.151.252/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x681C97FE /* 104.28.151.254/32 */, 32, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF80000 /* 140.248.0.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF80400 /* 140.248.4.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF80600 /* 140.248.6.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1896,7 +1888,7 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x8CF82280 /* 140.248.34.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF822C0 /* 140.248.34.192/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF822E0 /* 140.248.34.224/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF822F0 /* 140.248.34.240/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF822F0 /* 140.248.34.240/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82400 /* 140.248.36.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82500 /* 140.248.37.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82540 /* 140.248.37.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1908,10 +1900,18 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x8CF82800 /* 140.248.40.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82880 /* 140.248.40.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF828C0 /* 140.248.40.192/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8400 /* 146.75.132.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8500 /* 146.75.133.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8540 /* 146.75.133.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8550 /* 146.75.133.80/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82900 /* 140.248.41.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82940 /* 140.248.41.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82950 /* 140.248.41.80/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82958 /* 140.248.41.88/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF8295C /* 140.248.41.92/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82C00 /* 140.248.44.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82E00 /* 140.248.46.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82E40 /* 140.248.46.64/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82E60 /* 140.248.46.96/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82E70 /* 140.248.46.112/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82E78 /* 140.248.46.120/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x8CF82E7C /* 140.248.46.124/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8600 /* 146.75.134.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8800 /* 146.75.136.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8900 /* 146.75.137.0/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1922,14 +1922,12 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x924B8E00 /* 146.75.142.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8F00 /* 146.75.143.0/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B8F10 /* 146.75.143.16/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9000 /* 146.75.144.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9100 /* 146.75.145.0/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9120 /* 146.75.145.32/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9130 /* 146.75.145.48/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9138 /* 146.75.145.56/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B913C /* 146.75.145.60/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9200 /* 146.75.146.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9300 /* 146.75.147.0/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9400 /* 146.75.148.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9600 /* 146.75.150.0/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9610 /* 146.75.150.16/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9614 /* 146.75.150.20/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9800 /* 146.75.152.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9900 /* 146.75.153.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924B9A00 /* 146.75.154.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1955,9 +1953,7 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x924BA600 /* 146.75.166.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA680 /* 146.75.166.128/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA690 /* 146.75.166.144/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA700 /* 146.75.167.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA780 /* 146.75.167.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA7C0 /* 146.75.167.192/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA6C0 /* 146.75.166.192/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA800 /* 146.75.168.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA880 /* 146.75.168.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA900 /* 146.75.169.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -1965,14 +1961,13 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x924BA9C0 /* 146.75.169.192/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA9E0 /* 146.75.169.224/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BA9F0 /* 146.75.169.240/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAA00 /* 146.75.170.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAB00 /* 146.75.171.0/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAC00 /* 146.75.172.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAD00 /* 146.75.173.0/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAD20 /* 146.75.173.32/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAE00 /* 146.75.174.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAE80 /* 146.75.174.128/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAE88 /* 146.75.174.136/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAE8C /* 146.75.174.140/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAF00 /* 146.75.175.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAF40 /* 146.75.175.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BAF50 /* 146.75.175.80/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2090,13 +2085,6 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0x924BE200 /* 146.75.226.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE300 /* 146.75.227.0/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE320 /* 146.75.227.32/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE400 /* 146.75.228.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE600 /* 146.75.230.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE640 /* 146.75.230.64/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE660 /* 146.75.230.96/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE670 /* 146.75.230.112/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE678 /* 146.75.230.120/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE67C /* 146.75.230.124/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BE800 /* 146.75.232.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BEA00 /* 146.75.234.0/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0x924BEA20 /* 146.75.234.32/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2227,12 +2215,6 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0xACE1066C /* 172.225.6.108/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10670 /* 172.225.6.112/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10700 /* 172.225.7.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10800 /* 172.225.8.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10900 /* 172.225.9.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10940 /* 172.225.9.64/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10960 /* 172.225.9.96/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10970 /* 172.225.9.112/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10980 /* 172.225.9.128/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10A00 /* 172.225.10.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10A40 /* 172.225.10.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE10A50 /* 172.225.10.80/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2507,9 +2489,8 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0xACE19188 /* 172.225.145.136/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19190 /* 172.225.145.144/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE191A0 /* 172.225.145.160/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19200 /* 172.225.146.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19400 /* 172.225.148.0/22 */, 22, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19800 /* 172.225.152.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19800 /* 172.225.152.0/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19860 /* 172.225.152.96/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19A00 /* 172.225.154.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19A80 /* 172.225.154.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE19AC0 /* 172.225.154.192/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2554,6 +2535,11 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0xACE1AA40 /* 172.225.170.64/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1AA60 /* 172.225.170.96/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1AA70 /* 172.225.170.112/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1AC00 /* 172.225.172.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1AC80 /* 172.225.172.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1ACC0 /* 172.225.172.192/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1ACD0 /* 172.225.172.208/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1ACE0 /* 172.225.172.224/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1AE00 /* 172.225.174.0/23 */, 23, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B000 /* 172.225.176.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B200 /* 172.225.178.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2568,6 +2554,14 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0xACE1B5B8 /* 172.225.181.184/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B5BC /* 172.225.181.188/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B5C0 /* 172.225.181.192/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B600 /* 172.225.182.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B700 /* 172.225.183.0/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B710 /* 172.225.183.16/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B718 /* 172.225.183.24/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B720 /* 172.225.183.32/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B740 /* 172.225.183.64/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B780 /* 172.225.183.128/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B7A0 /* 172.225.183.160/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B800 /* 172.225.184.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B880 /* 172.225.184.128/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1B8A0 /* 172.225.184.160/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2723,6 +2717,12 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0xACE1FE00 /* 172.225.254.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FE40 /* 172.225.254.64/31 */, 31, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FE48 /* 172.225.254.72/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FF00 /* 172.225.255.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FF40 /* 172.225.255.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FF50 /* 172.225.255.80/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FF58 /* 172.225.255.88/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FF60 /* 172.225.255.96/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE1FF80 /* 172.225.255.128/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE20000 /* 172.226.0.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE20040 /* 172.226.0.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE20050 /* 172.226.0.80/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
@@ -2763,9 +2763,7 @@ static ndpi_network ndpi_anonymous_subscriber_protocol_list[] = {
|
||||
{ 0xACE20F20 /* 172.226.15.32/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE20F30 /* 172.226.15.48/30 */, 30, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE20F38 /* 172.226.15.56/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21000 /* 172.226.16.0/26 */, 26, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21040 /* 172.226.16.64/28 */, 28, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21050 /* 172.226.16.80/29 */, 29, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21000 /* 172.226.16.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21200 /* 172.226.18.0/24 */, 24, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21300 /* 172.226.19.0/25 */, 25, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
{ 0xACE21380 /* 172.226.19.128/27 */, 27, NDPI_ANONYMOUS_SUBSCRIBER },
|
||||
|
||||
@@ -24,7 +24,11 @@ static ndpi_network ndpi_protocol_microsoft_365_protocol_list[] = {
|
||||
{ 0x0D6B8C06 /* 13.107.140.6/32 */, 32, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x0D6B120F /* 13.107.18.15/32 */, 32, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x0D6B06AB /* 13.107.6.171/32 */, 32, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x0D6B06C0 /* 13.107.6.192/32 */, 32, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x0D6B09C0 /* 13.107.9.192/32 */, 32, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x14BE8000 /* 20.190.128.0/18 */, 18, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x14142000 /* 20.20.32.0/19 */, 19, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x14E78000 /* 20.231.128.0/19 */, 19, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x287E0000 /* 40.126.0.0/18 */, 18, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x346C0000 /* 52.108.0.0/14 */, 14, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
{ 0x34F425A8 /* 52.244.37.168/32 */, 32, NDPI_PROTOCOL_MICROSOFT_365 },
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -50,6 +50,8 @@ static ndpi_network ndpi_protocol_zoom_protocol_list[] = {
|
||||
{ 0x0D349200 /* 13.52.146.0/25 */, 25, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x0FDC5000 /* 15.220.80.0/24 */, 24, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x0FDC5100 /* 15.220.81.0/25 */, 25, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x103F1D00 /* 16.63.29.0/24 */, 24, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x103F1E00 /* 16.63.30.0/24 */, 24, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x129D5800 /* 18.157.88.0/24 */, 24, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x12CD5D80 /* 18.205.93.128/25 */, 25, NDPI_PROTOCOL_ZOOM },
|
||||
{ 0x12FE1780 /* 18.254.23.128/25 */, 25, NDPI_PROTOCOL_ZOOM },
|
||||
|
||||
@@ -502,7 +502,7 @@ static ndpi_network host_protocol_list[] = {
|
||||
|
||||
|
||||
/* Teamviewer
|
||||
router1.teamviewer.com... router16.teamviewer.com
|
||||
router1.teamviewer.com... router16.teamviewer.com
|
||||
TODO: are we able to autogenerate this list (like the other Teamviewer IPs)?
|
||||
*/
|
||||
{ 0x25FCE044 /* 37.252.224.68 */, 30, NDPI_PROTOCOL_TEAMVIEWER },
|
||||
@@ -1237,7 +1237,10 @@ static ndpi_protocol_match host_match[] =
|
||||
|
||||
{ "deezer.com", "Deezer", NDPI_PROTOCOL_DEEZER, NDPI_PROTOCOL_CATEGORY_MUSIC, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
/* Microsoft + Azure */
|
||||
/*
|
||||
Microsoft + Azure
|
||||
https://learn.microsoft.com/en-us/windows/privacy/manage-windows-1903-endpoints
|
||||
*/
|
||||
{ ".wpc.v0cdn.net", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ ".gfx.ms", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ ".aka.ms", "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
@@ -1303,6 +1306,10 @@ static ndpi_protocol_match host_match[] =
|
||||
{ "teams-msgapi.trafficmanager.net", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "teams.office.net", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "teams.office.com", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "statics.teams.cdn.live.net", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ ".mstea.ms", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "aka.ms", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "teams.events.data.microsoft.com", "Teams", NDPI_PROTOCOL_MSTEAMS, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
{ ".storage.live.com", "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE,NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "skyapi.live.net", "MS_OneDrive", NDPI_PROTOCOL_MS_ONE_DRIVE, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
@@ -1364,6 +1371,8 @@ static ndpi_protocol_match host_match[] =
|
||||
{ "mail.live.com", "Microsoft365", NDPI_PROTOCOL_MICROSOFT_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "office.live.com", "Microsoft365", NDPI_PROTOCOL_MICROSOFT_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ ".onenote.", "Microsoft365", NDPI_PROTOCOL_MICROSOFT_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ ".cloud.microsoft", "Microsoft365", NDPI_PROTOCOL_MICROSOFT_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "whiteboard.microsoft.com", "Microsoft365", NDPI_PROTOCOL_MICROSOFT_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
{ "cloudflare.com", "Cloudflare", NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
@@ -1787,7 +1796,7 @@ static ndpi_protocol_match host_match[] =
|
||||
|
||||
{ "siriusxm.ca", "SiriusXMRadio", NDPI_PROTOCOL_SIRIUSXMRADIO, NDPI_PROTOCOL_CATEGORY_MUSIC, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ "siriusxm.com", "SiriusXMRadio", NDPI_PROTOCOL_SIRIUSXMRADIO, NDPI_PROTOCOL_CATEGORY_MUSIC, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
|
||||
{ "tailscale.com", "Tailscale", NDPI_PROTOCOL_TAILSCALE, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
#ifdef CUSTOM_NDPI_PROTOCOLS
|
||||
@@ -1935,4 +1944,3 @@ static ndpi_category_match category_match[] = {
|
||||
|
||||
{ NULL, 0 }
|
||||
};
|
||||
|
||||
|
||||
+113
-19
@@ -2188,21 +2188,24 @@ void ndpi_patricia_get_stats(ndpi_patricia_tree_t *tree, struct ndpi_patricia_tr
|
||||
/* ******************************************************************** */
|
||||
|
||||
int ndpi_get_patricia_stats(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
ptree_type ptree_type,
|
||||
struct ndpi_patricia_tree_stats *stats) {
|
||||
ptree_type ptree_type,
|
||||
struct ndpi_patricia_tree_stats *stats) {
|
||||
if(!ndpi_struct || !stats)
|
||||
return -1;
|
||||
|
||||
switch(ptree_type) {
|
||||
case NDPI_PTREE_RISK_MASK:
|
||||
ndpi_patricia_get_stats((ndpi_patricia_tree_t *)ndpi_struct->ip_risk_mask_ptree, stats);
|
||||
ndpi_patricia_get_stats(ndpi_struct->ip_risk_mask_ptree, stats);
|
||||
return 0;
|
||||
|
||||
case NDPI_PTREE_RISK:
|
||||
ndpi_patricia_get_stats((ndpi_patricia_tree_t *)ndpi_struct->ip_risk_ptree, stats);
|
||||
ndpi_patricia_get_stats(ndpi_struct->ip_risk_ptree, stats);
|
||||
return 0;
|
||||
|
||||
case NDPI_PTREE_PROTOCOLS:
|
||||
ndpi_patricia_get_stats((ndpi_patricia_tree_t *)ndpi_struct->protocols_ptree, stats);
|
||||
ndpi_patricia_get_stats(ndpi_struct->protocols_ptree, stats);
|
||||
return 0;
|
||||
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
@@ -2356,9 +2359,28 @@ u_int16_t ndpi_network_port_ptree_match(struct ndpi_detection_module_struct *ndp
|
||||
node = ndpi_patricia_search_best(ndpi_str->protocols_ptree, &prefix);
|
||||
|
||||
if(node) {
|
||||
if((node->value.u.uv32.additional_user_value == 0)
|
||||
|| (node->value.u.uv32.additional_user_value == port))
|
||||
return(node->value.u.uv32.user_value);
|
||||
int i;
|
||||
struct patricia_uv16_list *item;
|
||||
|
||||
for(i=0; i<UV16_MAX_USER_VALUES; i++) {
|
||||
if((node->value.u.uv16[i].additional_user_value == 0)
|
||||
|| (node->value.u.uv16[i].additional_user_value == port))
|
||||
return(node->value.u.uv16[i].user_value);
|
||||
}
|
||||
|
||||
/*
|
||||
If we're here it means that we don't have
|
||||
enough room for our custom value so we need
|
||||
to check the custom_user_data pointer.
|
||||
*/
|
||||
item = (struct patricia_uv16_list*)node->data;
|
||||
|
||||
while(item != NULL) {
|
||||
if(item->value.additional_user_value == port)
|
||||
return(item->value.user_value);
|
||||
else
|
||||
item = item->next;
|
||||
}
|
||||
}
|
||||
|
||||
return(NDPI_PROTOCOL_UNKNOWN);
|
||||
@@ -2438,8 +2460,18 @@ int ndpi_load_ipv4_ptree(struct ndpi_detection_module_struct *ndpi_str,
|
||||
|
||||
pin.s_addr = inet_addr(addr);
|
||||
if((node = add_to_ptree(ndpi_str->protocols_ptree, AF_INET, &pin, cidr ? atoi(cidr) : 32 /* bits */)) != NULL) {
|
||||
node->value.u.uv32.user_value = protocol_id, node->value.u.uv32.additional_user_value = 0 /* port */;
|
||||
num_loaded++;
|
||||
u_int i, found = 0;
|
||||
|
||||
for(i=0; i<UV16_MAX_USER_VALUES; i++) {
|
||||
if(node->value.u.uv16[i].user_value == 0) {
|
||||
node->value.u.uv16[i].user_value = protocol_id, node->value.u.uv16[i].additional_user_value = 0 /* port */;
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(found)
|
||||
num_loaded++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2460,9 +2492,10 @@ static void ndpi_init_ptree_ipv4(struct ndpi_detection_module_struct *ndpi_str,
|
||||
|
||||
pin.s_addr = htonl(host_list[i].network);
|
||||
if((node = add_to_ptree(ptree, AF_INET, &pin, host_list[i].cidr /* bits */)) != NULL) {
|
||||
/* Two main cases:
|
||||
1) ip -> protocol: uv32.user_value = protocol; uv32.additional_user_value = 0;
|
||||
2) ip -> risk: uv32.user_value = risk; uv32.additional_user_value = 0;
|
||||
/*
|
||||
Two main cases:
|
||||
1) ip -> protocol: uv16[0].user_value = protocol; uv16[0].additional_user_value = 0;
|
||||
2) ip -> risk: uv16[0].user_value = risk; uv16[0].additional_user_value = 0;
|
||||
*/
|
||||
node->value.u.uv32.user_value = host_list[i].value, node->value.u.uv32.additional_user_value = 0;
|
||||
}
|
||||
@@ -2507,7 +2540,34 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp
|
||||
inet_pton(AF_INET, value, &pin);
|
||||
|
||||
if((node = add_to_ptree(ndpi_str->protocols_ptree, AF_INET, &pin, bits)) != NULL) {
|
||||
node->value.u.uv32.user_value = protocol_id, node->value.u.uv32.additional_user_value = htons(port);
|
||||
int i;
|
||||
struct patricia_uv16_list *item;
|
||||
|
||||
for(i=0; i<UV16_MAX_USER_VALUES; i++) {
|
||||
if(node->value.u.uv16[i].user_value == 0) {
|
||||
node->value.u.uv16[i].user_value = protocol_id, node->value.u.uv16[i].additional_user_value = htons(port);
|
||||
|
||||
return(0);
|
||||
}
|
||||
} /* for */
|
||||
|
||||
/*
|
||||
If we're here it means that we don't have
|
||||
enough room for our custom value
|
||||
*/
|
||||
item = (struct patricia_uv16_list*)ndpi_malloc(sizeof(struct patricia_uv16_list));
|
||||
|
||||
if(item != NULL) {
|
||||
item->value.user_value = protocol_id,
|
||||
item->value.additional_user_value = htons(port),
|
||||
item->next = (struct patricia_uv16_list*)node->data;
|
||||
|
||||
node->data = item;
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
return(-1); /* All slots are full */
|
||||
}
|
||||
|
||||
return(0);
|
||||
@@ -2948,6 +3008,8 @@ static void ndpi_add_domain_risk_exceptions(struct ndpi_detection_module_struct
|
||||
u_int i;
|
||||
ndpi_risk mask = ((ndpi_risk)-1);
|
||||
|
||||
if(!ndpi_str) return;
|
||||
|
||||
for(i=0; risks_to_mask[i] != NDPI_NO_RISK; i++)
|
||||
mask &= ~(1ULL << risks_to_mask[i]);
|
||||
|
||||
@@ -3282,7 +3344,14 @@ int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_str
|
||||
/* *********************************************** */
|
||||
|
||||
static void free_ptree_data(void *data) {
|
||||
;
|
||||
struct patricia_uv16_list *item = (struct patricia_uv16_list *)data;
|
||||
|
||||
while(item != NULL) {
|
||||
struct patricia_uv16_list *next = item->next;
|
||||
|
||||
free(item);
|
||||
item = next;
|
||||
}
|
||||
}
|
||||
|
||||
/* ****************************************************** */
|
||||
@@ -3302,7 +3371,7 @@ void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_str) {
|
||||
for(i = 0; (i < MAX_NBPF_CUSTOM_PROTO) && (ndpi_str->nbpf_custom_proto[i].tree != NULL); i++)
|
||||
nbpf_free(ndpi_str->nbpf_custom_proto[i].tree);
|
||||
#endif
|
||||
|
||||
|
||||
/* NDPI_PROTOCOL_TINC */
|
||||
if(ndpi_str->tinc_cache)
|
||||
cache_free((cache_t)(ndpi_str->tinc_cache));
|
||||
@@ -3335,10 +3404,10 @@ void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_str) {
|
||||
ndpi_patricia_destroy((ndpi_patricia_tree_t *) ndpi_str->protocols_ptree, free_ptree_data);
|
||||
|
||||
if(ndpi_str->ip_risk_mask_ptree)
|
||||
ndpi_patricia_destroy((ndpi_patricia_tree_t *) ndpi_str->ip_risk_mask_ptree, free_ptree_data);
|
||||
ndpi_patricia_destroy((ndpi_patricia_tree_t *) ndpi_str->ip_risk_mask_ptree, NULL);
|
||||
|
||||
if(ndpi_str->ip_risk_ptree)
|
||||
ndpi_patricia_destroy((ndpi_patricia_tree_t *) ndpi_str->ip_risk_ptree, free_ptree_data);
|
||||
ndpi_patricia_destroy((ndpi_patricia_tree_t *) ndpi_str->ip_risk_ptree, NULL);
|
||||
|
||||
if(ndpi_str->udpRoot != NULL) ndpi_tdestroy(ndpi_str->udpRoot, ndpi_free);
|
||||
if(ndpi_str->tcpRoot != NULL) ndpi_tdestroy(ndpi_str->tcpRoot, ndpi_free);
|
||||
@@ -7976,6 +8045,9 @@ ndpi_protocol_category_t ndpi_get_proto_category(struct ndpi_detection_module_st
|
||||
|
||||
char *ndpi_get_proto_name(struct ndpi_detection_module_struct *ndpi_str,
|
||||
u_int16_t proto_id) {
|
||||
|
||||
if(!ndpi_str) return("Unknown");
|
||||
|
||||
if((proto_id >= ndpi_str->ndpi_num_supported_protocols)
|
||||
|| (!ndpi_is_valid_protoId(proto_id))
|
||||
|| (ndpi_str->proto_defaults[proto_id].protoName == NULL))
|
||||
@@ -7988,6 +8060,9 @@ char *ndpi_get_proto_name(struct ndpi_detection_module_struct *ndpi_str,
|
||||
|
||||
ndpi_protocol_breed_t ndpi_get_proto_breed(struct ndpi_detection_module_struct *ndpi_str,
|
||||
u_int16_t proto_id) {
|
||||
|
||||
if(!ndpi_str) return(NDPI_PROTOCOL_UNRATED);
|
||||
|
||||
if((proto_id >= ndpi_str->ndpi_num_supported_protocols) ||
|
||||
(!ndpi_is_valid_protoId(proto_id)) ||
|
||||
(ndpi_str->proto_defaults[proto_id].protoName == NULL))
|
||||
@@ -8027,6 +8102,8 @@ char *ndpi_get_proto_breed_name(struct ndpi_detection_module_struct *ndpi_str,
|
||||
int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_str, char *proto) {
|
||||
int i;
|
||||
|
||||
if(!ndpi_str) return(-1);
|
||||
|
||||
for(i = 0; i < (int) ndpi_str->ndpi_num_supported_protocols; i++)
|
||||
if(ndpi_str->proto_defaults[i].protoName &&
|
||||
strcasecmp(proto, ndpi_str->proto_defaults[i].protoName) == 0)
|
||||
@@ -8040,6 +8117,8 @@ int ndpi_get_protocol_id(struct ndpi_detection_module_struct *ndpi_str, char *pr
|
||||
int ndpi_get_category_id(struct ndpi_detection_module_struct *ndpi_str, char *cat) {
|
||||
int i;
|
||||
|
||||
if(!ndpi_str) return(-1);
|
||||
|
||||
for(i = 0; i < NDPI_PROTOCOL_NUM_CATEGORIES; i++) {
|
||||
const char *name = ndpi_category_get_name(ndpi_str, i);
|
||||
|
||||
@@ -8055,6 +8134,8 @@ int ndpi_get_category_id(struct ndpi_detection_module_struct *ndpi_str, char *ca
|
||||
void ndpi_dump_protocols(struct ndpi_detection_module_struct *ndpi_str) {
|
||||
int i;
|
||||
|
||||
if(!ndpi_str) return;
|
||||
|
||||
for(i = 0; i < (int) ndpi_str->ndpi_num_supported_protocols; i++)
|
||||
printf("%3d %-22s %-10s %-8s %-12s %s\n",
|
||||
i, ndpi_str->proto_defaults[i].protoName,
|
||||
@@ -8210,6 +8291,8 @@ int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_str,
|
||||
ndpi_automa *automa = &ndpi_str->host_automa;
|
||||
int rc;
|
||||
|
||||
if(!ndpi_str) return(NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
if((automa->ac_automa == NULL) || (string_to_match_len == 0))
|
||||
return(NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
@@ -8250,6 +8333,8 @@ static u_int16_t ndpi_automa_match_string_subprotocol(struct ndpi_detection_modu
|
||||
ndpi_protocol_match_result *ret_match) {
|
||||
int matching_protocol_id;
|
||||
|
||||
if(!ndpi_str) return(NDPI_PROTOCOL_UNKNOWN);
|
||||
|
||||
matching_protocol_id =
|
||||
ndpi_match_string_subprotocol(ndpi_str, string_to_match, string_to_match_len, ret_match);
|
||||
|
||||
@@ -8304,6 +8389,9 @@ static u_int16_t ndpi_automa_match_string_subprotocol(struct ndpi_detection_modu
|
||||
|
||||
void ndpi_check_subprotocol_risk(struct ndpi_detection_module_struct *ndpi_str,
|
||||
struct ndpi_flow_struct *flow, u_int16_t subprotocol_id) {
|
||||
|
||||
if(!ndpi_str) return;
|
||||
|
||||
switch(subprotocol_id) {
|
||||
case NDPI_PROTOCOL_ANYDESK:
|
||||
ndpi_set_risk(ndpi_str, flow, NDPI_DESKTOP_OR_FILE_SHARING_SESSION, "Found AnyDesk"); /* Remote assistance */
|
||||
@@ -8321,6 +8409,8 @@ u_int16_t ndpi_match_host_subprotocol(struct ndpi_detection_module_struct *ndpi_
|
||||
u_int16_t rc;
|
||||
ndpi_protocol_category_t id;
|
||||
|
||||
if(!ndpi_str) return(-1);
|
||||
|
||||
memset(ret_match, 0, sizeof(*ret_match));
|
||||
|
||||
rc = ndpi_automa_match_string_subprotocol(ndpi_str, flow,
|
||||
@@ -8369,6 +8459,8 @@ int ndpi_match_hostname_protocol(struct ndpi_detection_module_struct *ndpi_struc
|
||||
u_int16_t subproto, what_len;
|
||||
char *what;
|
||||
|
||||
if(!ndpi_struct) return(0);
|
||||
|
||||
if((name_len > 2) && (name[0] == '*') && (name[1] == '.'))
|
||||
what = &name[1], what_len = name_len - 1;
|
||||
else
|
||||
@@ -8390,14 +8482,17 @@ int ndpi_match_hostname_protocol(struct ndpi_detection_module_struct *ndpi_struc
|
||||
|
||||
static inline int ndpi_match_xgram(unsigned int *map,unsigned int l,const char *str) {
|
||||
unsigned int i,c;
|
||||
|
||||
for(i=0,c=0; *str && i < l; i++) {
|
||||
unsigned char a = (unsigned char)(*str++);
|
||||
if(a < 'a' || a > 'z') return 0;
|
||||
c *= XGRAMS_C;
|
||||
c += a-'a';
|
||||
}
|
||||
|
||||
return (map[c >> 5] & (1u << (c & 0x1f))) != 0;
|
||||
}
|
||||
|
||||
int ndpi_match_bigram(const char *str) {
|
||||
return ndpi_match_xgram(bigrams_bitmap, 2, str);
|
||||
}
|
||||
@@ -8412,7 +8507,6 @@ int ndpi_match_trigram(const char *str) {
|
||||
return ndpi_match_xgram(trigrams_bitmap, 3, str);
|
||||
}
|
||||
|
||||
|
||||
/* ****************************************************** */
|
||||
|
||||
void ndpi_free_flow(struct ndpi_flow_struct *flow) {
|
||||
|
||||
+26
-7
@@ -2416,6 +2416,23 @@ static void ndpi_handle_risk_exceptions(struct ndpi_detection_module_struct *ndp
|
||||
if(host && (host[0] != '\0')) {
|
||||
/* Check host exception */
|
||||
ndpi_check_hostname_risk_exception(ndpi_str, flow, host);
|
||||
|
||||
if(flow->risk_mask == 0) {
|
||||
u_int i;
|
||||
|
||||
/*
|
||||
Might be that the exception applied when some risks
|
||||
were already triggered: we need to clean them up
|
||||
*/
|
||||
for(i=0; i<flow->num_risk_infos; i++) {
|
||||
if(flow->risk_infos[i].info != NULL) {
|
||||
free(flow->risk_infos[i].info);
|
||||
flow->risk_infos[i].info = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
flow->num_risk_infos = 0;
|
||||
}
|
||||
|
||||
/* Used to avoid double checks (e.g. in DNS req/rsp) */
|
||||
flow->host_risk_mask_evaluated = 1;
|
||||
@@ -2449,14 +2466,16 @@ void ndpi_set_risk(struct ndpi_detection_module_struct *ndpi_str,
|
||||
|
||||
ndpi_handle_risk_exceptions(ndpi_str, flow);
|
||||
|
||||
if(risk_message != NULL) {
|
||||
if(flow->num_risk_infos < MAX_NUM_RISK_INFOS) {
|
||||
char *s = ndpi_strdup(risk_message);
|
||||
if(flow->risk != 0 /* check if it has been masked */) {
|
||||
if(risk_message != NULL) {
|
||||
if(flow->num_risk_infos < MAX_NUM_RISK_INFOS) {
|
||||
char *s = ndpi_strdup(risk_message);
|
||||
|
||||
if(s != NULL) {
|
||||
flow->risk_infos[flow->num_risk_infos].id = r;
|
||||
flow->risk_infos[flow->num_risk_infos].info = s;
|
||||
flow->num_risk_infos++;
|
||||
if(s != NULL) {
|
||||
flow->risk_infos[flow->num_risk_infos].id = r;
|
||||
flow->risk_infos[flow->num_risk_infos].info = s;
|
||||
flow->num_risk_infos++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+11
@@ -260,7 +260,18 @@ AC_ERROR_t ac_automata_add (AC_AUTOMATA_t * thiz, AC_PATTERN_t * patt)
|
||||
thiz->max_str_len = patt->length;
|
||||
|
||||
if(n->final && n->matched_patterns) {
|
||||
/*
|
||||
In this case an existing pattern exists and thus we overwrite
|
||||
the previous protocol value with this one
|
||||
*/
|
||||
|
||||
#if 1
|
||||
/* nDPI code */
|
||||
n->matched_patterns->patterns[0].rep.number = patt->rep.number;
|
||||
#else
|
||||
/* original code */
|
||||
patt->rep.number = n->matched_patterns->patterns[0].rep.number;
|
||||
#endif
|
||||
return ACERR_DUPLICATE_PATTERN;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user