Add support for Google Cloud (#1447)

Differentiate between Google its own apps/services and Google Cloud. We already do something similar for Amazon vs AWS and Microsoft vs Azure.
ntop · Feb 20, 2022 · 2f5f445 · 2f5f445
1 parent 75a53ad
commit 2f5f445
Show file tree

Hide file tree

Showing 18 changed files with 797 additions and 99 deletions.
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
@@ -312,6 +312,7 @@ typedef enum {
   NDPI_PROTOCOL_GOOGLE_CLASSROOM      = 281,
   NDPI_PROTOCOL_HSRP                  = 282,
   NDPI_PROTOCOL_CYBERSECURITY         = 283, /* Cybersecurity companies */
+  NDPI_PROTOCOL_GOOGLE_CLOUD          = 284,
 
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"

diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
@@ -1400,6 +1400,8 @@ typedef enum
     ndpi_dont_load_zoom_list       = (1 << 7),
     ndpi_dont_load_cloudflare_list = (1 << 8),
     ndpi_dont_load_microsoft_list  = (1 << 9),
+    ndpi_dont_load_google_list     = (1 << 10),
+    ndpi_dont_load_google_cloud_list = (1 << 11),
   } ndpi_prefs;
 
 typedef struct {

diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
@@ -877,81 +877,6 @@ static ndpi_network host_protocol_list[] = {
   { 0xC76C3000 /* 199.108.48.0/20 */, 20, NDPI_PROTOCOL_STARCRAFT },
   { 0xCA094200 /* 202.9.66.0/23 */, 23, NDPI_PROTOCOL_STARCRAFT },
 
-  /*
-    Google Inc. / Google Switzerland GmbH / Google Ireland Limited
-    origin AS15169, AS36384, AS41264, AS43515, AS36039, AS36040, AS36492
-  */
-  { 0x08063000 /* 8.6.48.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x08080400 /* 8.8.4.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x08080800 /* 8.8.8.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x080FCA00 /* 8.15.202.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x0822D000 /* 8.34.208.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x0822D800 /* 8.34.216.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x0823C000 /* 8.35.192.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x0823C800 /* 8.35.200.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x17EC3000 /* 23.236.48.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0x17FB8000 /* 23.251.128.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x23B80000 /* 35.184.0.0/13 */, 13, NDPI_PROTOCOL_GOOGLE },
-  { 0x2D79E400 /* 45.121.228.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x2D79E500 /* 45.121.229.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x2D79E600 /* 45.121.230.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
-  { 0x2E1CF700 /* 46.28.247.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x4009E000 /* 64.9.224.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x400F7000 /* 64.15.112.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0x40E9A000 /* 64.233.160.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x42660000 /* 66.102.0.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0x42F94000 /* 66.249.64.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x46208000 /* 70.32.128.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x480EC000 /* 72.14.192.0/18 */, 18, NDPI_PROTOCOL_GOOGLE },
-  { 0x4A721800 /* 74.114.24.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x4A7D0000 /* 74.125.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
-  { 0x59CFE000 /* 89.207.224.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0x673E4000 /* 103.62.64.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x673E4100 /* 103.62.65.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0x673E4200 /* 103.62.66.0/23 */, 23, NDPI_PROTOCOL_GOOGLE },
-  { 0x68840000 /* 104.132.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE },
-  { 0x689A0000 /* 104.154.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE },
-  { 0x68C40000 /* 104.196.0.0/14 */, 14, NDPI_PROTOCOL_GOOGLE },
-  { 0x68EDA000 /* 104.237.160.0/19*/, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x6BA7A000 /* 107.167.160.0/19*/, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0x6BB2C000 /* 107.178.192.0/18*/, 18, NDPI_PROTOCOL_GOOGLE },
-  { 0x6C3B5000 /* 108.59.80.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0x6CAAC000 /* 108.170.192.0/18*/, 18, NDPI_PROTOCOL_GOOGLE },
-  { 0x6CB10000 /* 108.177.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
-  { 0x71C56800 /* 113.197.104.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0x82D30000 /* 130.211.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
-  { 0x8EFA0000 /* 142.250.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE },
-  { 0x92940000 /* 146.148.0.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
-  { 0xA2D89400 /* 162.216.148.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xA2DEB000 /* 162.222.176.0/21*/, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0xAC660800 /* 172.102.8.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0xAC6E2000 /* 172.110.32.0/21 */, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0xACD90000 /* 172.217.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
-  { 0xACFD0000 /* 172.253.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
-  { 0xADC20000 /* 173.194.0.0/16 */, 16, NDPI_PROTOCOL_GOOGLE },
-  { 0xADFF7000 /* 173.255.112.0/20*/, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0xB9191C00 /* 185.25.28.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xB9969400 /* 185.150.148.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xC068A000 /* 192.104.160.0/23*/, 23, NDPI_PROTOCOL_GOOGLE },
-  { 0xC0771C00 /* 192.119.28.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0xC09E1C00 /* 192.158.28.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xC0B20000 /* 192.178.0.0/15 */, 15, NDPI_PROTOCOL_GOOGLE },
-  { 0xC1210400 /* 193.33.4.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0xC1210500 /* 193.33.5.0/24 */, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0xC1C8DE00 /* 193.200.222.0/24*/, 24, NDPI_PROTOCOL_GOOGLE },
-  { 0xC27A5000 /* 194.122.80.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xC7C07000 /* 199.192.112.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xC7DFE800 /* 199.223.232.0/21*/, 21, NDPI_PROTOCOL_GOOGLE },
-  { 0xCFDFA000 /* 207.223.160.0/20*/, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0xD0419800 /* 208.65.152.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-  { 0xD075E000 /* 208.117.224.0/19*/, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0xD1558000 /* 209.85.128.0/17 */, 17, NDPI_PROTOCOL_GOOGLE },
-  { 0xD16BB000 /* 209.107.176.0/20*/, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0xD83AC000 /* 216.58.192.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0xD8495000 /* 216.73.80.0/20 */, 20, NDPI_PROTOCOL_GOOGLE },
-  { 0xD8EF2000 /* 216.239.32.0/19 */, 19, NDPI_PROTOCOL_GOOGLE },
-  { 0xD8FCDC00 /* 216.252.220.0/22 */, 22, NDPI_PROTOCOL_GOOGLE },
-
   /*
     Canonical Ltd (Ubuntu)
     origin AS41231z