deleted old and not yet good skype ip addr - added new Netflix and CloudFlare IP addr

1 files changed, 7 insertions, 157 deletions

diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index d0587eea9..411a3961d 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -38,8 +38,6 @@ static ndpi_network host_protocol_list[] = {
   { 0x83FD0C00 /* 131.253.12.0/22 */, 22, NDPI_SERVICE_MS_ONE_DRIVE },
   { 0x83FD1000 /* 131.253.16.0/23 */, 23, NDPI_SERVICE_MS_ONE_DRIVE },
   { 0x83FD1200 /* 131.253.18.0/24 */, 24, NDPI_SERVICE_MS_ONE_DRIVE },
-
-
   { 0x4136BF00 /* 65.54.191.0/24   */, 24, NDPI_SERVICE_MS_ONE_DRIVE },
 
 
@@ -58,16 +56,22 @@ static ndpi_network host_protocol_list[] = {
  /*    
     Netflix
     23.246.0.0/18
+    23.21.190.124/32
   */
   { 0x17F60000 /* 23.246.0.0/18 */, 18, NDPI_SERVICE_NETFLIX },
+  { 0x1715BE7C /* 23.21.190.124/32 */, 32, NDPI_SERVICE_NETFLIX },
 
   /*    
     Cloudflare
     104.16.0.0/12
     173.245.48.0/20
+    162.158.0.0/15
+    141.101.125.0/24 CLOUDFLARE-EU CDN network
   */
   { 0x68100000 /* 104.16.0.0/12 */, 12, NDPI_SERVICE_CLOUDFLARE },
   { 0xADF53000 /* 173.245.48.0/20 */, 20, NDPI_SERVICE_CLOUDFLARE },
+  { 0xA29E0000 /* 162.158.0.0/15 */, 15, NDPI_SERVICE_CLOUDFLARE },
+  { 0x8D657D00 /* 141.101.125.0/24 */, 24, NDPI_SERVICE_CLOUDFLARE },
 
  /*    
     OFFICE 365
@@ -202,161 +206,7 @@ static ndpi_network host_protocol_list[] = {
   { 0x959AA400 /* 149.154.164.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM},
   { 0x959AA800 /* 149.154.168.0/22 */, 22, NDPI_PROTOCOL_TELEGRAM},
 
-  /* 
-    The Skype list below looks outdated and it is temporarely
-    commented and probably harvested in future releases
-  */
-#if 0
-  /* Skype */
-  { 0x17600000, 14, NDPI_PROTOCOL_SKYPE },
-  { 0x17613000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x17614000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0x17616000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0x17622000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x17622800, 22, NDPI_PROTOCOL_SKYPE },
-  { 0x17623800, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x17624000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0x17640000, 15, NDPI_PROTOCOL_SKYPE },
-  { 0x17660000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x17674000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0x17678000, 17, NDPI_PROTOCOL_SKYPE },
-  { 0x40040000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0x41340000, 14, NDPI_PROTOCOL_SKYPE },
-  { 0x4134A000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0x41362800, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x41364200, 23, NDPI_PROTOCOL_SKYPE },
-  { 0x41364400, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x41365200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x41365500, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x41365A00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0x41372C00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x41377500, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x4137E600, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x4137E700, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x42779000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x46250000, 17, NDPI_PROTOCOL_SKYPE },
-  { 0x46258000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0x46259600, 23, NDPI_PROTOCOL_SKYPE },
-  { 0x5EF54000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0x5EF54C00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0x5EF55200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x68280000, 13, NDPI_PROTOCOL_SKYPE },
-  { 0x68920000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0x68928000, 17, NDPI_PROTOCOL_SKYPE },
-  { 0x68D00000, 13, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD1000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD1000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD1700, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD4000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD4000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD4200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD4500, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD4600, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD4E00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD5000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD6000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD7000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD7800, 22, NDPI_PROTOCOL_SKYPE },
-  { 0x6FDD7C00, 22, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD0100, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD0500, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD0600, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD0800, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD0C00, 22, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD1200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD1500, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD1800, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD2000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD2100, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD2200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD3D00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD3E00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0x83FD8000, 17, NDPI_PROTOCOL_SKYPE },
-  { 0x84F50000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x84F59C00, 22, NDPI_PROTOCOL_SKYPE },
-  { 0x84F5A000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x86AA0000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x86AA8000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x86AA8800, 21, NDPI_PROTOCOL_SKYPE },
-  { 0x86AAD900, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x89740000, 15, NDPI_PROTOCOL_SKYPE },
-  { 0x89748000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0x8974A000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x89870000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x8A5B0000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x8A5B0000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x8A5B1000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x8A5B2000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0x9D370000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x9D380000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0x9D3C1700, 24, NDPI_PROTOCOL_SKYPE },
-  { 0x9D3C1F00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xA7DCF000, 22, NDPI_PROTOCOL_SKYPE },
-  { 0xA83D0000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0xA83E0000, 15, NDPI_PROTOCOL_SKYPE },
-  { 0xA83F8000, 17, NDPI_PROTOCOL_SKYPE },
-  { 0xBFE80000, 13, NDPI_PROTOCOL_SKYPE },
-  { 0xC030E100, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC0549F00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC054A000, 23, NDPI_PROTOCOL_SKYPE },
-  { 0xC0C59D00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC1954000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xC1DD7100, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC6310800, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC6C88200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC6CEA400, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC71E1000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0xC73C1C00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC74AD200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC7675A00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0xC7677A00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xC7F23000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0xCA59E000, 21, NDPI_PROTOCOL_SKYPE },
-  { 0xCC4F8700, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCC4FB300, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCC4FC300, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCC4FC500, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCC4FFC00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCC5F6000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0xCC988C00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0xCE8AA800, 21, NDPI_PROTOCOL_SKYPE },
-  { 0xCEBFE000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E0000, 16, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E0000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E2000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E2900, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E3000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E3A00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E3E00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E4000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E4800, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E4D00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E6000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E6200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E8000, 17, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2E8000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xCF2EE000, 20, NDPI_PROTOCOL_SKYPE },
-  { 0xCF448000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0xCF52FA00, 23, NDPI_PROTOCOL_SKYPE },
-  { 0xD0448800, 21, NDPI_PROTOCOL_SKYPE },
-  { 0xD04C2D00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD04C2E00, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD0540000, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD0540100, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD0540200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD0540300, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD1017000, 23, NDPI_PROTOCOL_SKYPE },
-  { 0xD1B98000, 22, NDPI_PROTOCOL_SKYPE },
-  { 0xD1B9F000, 22, NDPI_PROTOCOL_SKYPE },
-  { 0xD1F0C000, 19, NDPI_PROTOCOL_SKYPE },
-  { 0xD5C78000, 18, NDPI_PROTOCOL_SKYPE },
-  { 0xD820B400, 22, NDPI_PROTOCOL_SKYPE },
-  { 0xD820F000, 22, NDPI_PROTOCOL_SKYPE },
-  { 0xD820F200, 24, NDPI_PROTOCOL_SKYPE },
-  { 0xD821F000, 22, NDPI_PROTOCOL_SKYPE },
-  { 0xD4A10800, 24, NDPI_PROTOCOL_SKYPE },
-#endif
-
+  /* TOR  */
   { 0x012A1231, 32, NDPI_PROTOCOL_TOR },
   { 0x01E69FA1, 32, NDPI_PROTOCOL_TOR },
   { 0x020DE985, 32, NDPI_PROTOCOL_TOR },