IP lists: aggregate addresses wherever possible (#2152)

See #2150

1 files changed, 6 insertions, 10 deletions

diff --git a/src/lib/inc_generated/ndpi_asn_alibaba.c.inc b/src/lib/inc_generated/ndpi_asn_alibaba.c.inc
index ce08d1023..58ef064d2 100644
--- a/src/lib/inc_generated/ndpi_asn_alibaba.c.inc
+++ b/src/lib/inc_generated/ndpi_asn_alibaba.c.inc
@@ -45,7 +45,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
  { 0x08D80000 /* 8.216.0.0/14 */, 14, NDPI_PROTOCOL_ALIBABA },
  { 0x08DC0000 /* 8.220.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
  { 0x08DE0000 /* 8.222.0.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
- { 0x08DE4000 /* 8.222.64.0/20 */, 20, NDPI_PROTOCOL_ALIBABA },
+ { 0x08DE4000 /* 8.222.64.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
  { 0x08DE8000 /* 8.222.128.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
  { 0x0E017000 /* 14.1.112.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
  { 0x27600000 /* 39.96.0.0/13 */, 13, NDPI_PROTOCOL_ALIBABA },
@@ -63,8 +63,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
  { 0x2B600C00 /* 43.96.12.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
  { 0x2B601000 /* 43.96.16.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0x2B601200 /* 43.96.18.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
- { 0x2B601400 /* 43.96.20.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
- { 0x2B601600 /* 43.96.22.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
+ { 0x2B601400 /* 43.96.20.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
  { 0x2B601800 /* 43.96.24.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
  { 0x2B601C00 /* 43.96.28.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0x2B602000 /* 43.96.32.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
@@ -73,9 +72,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
  { 0x2B604800 /* 43.96.72.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
  { 0x2B605000 /* 43.96.80.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0x2D59C800 /* 45.89.200.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
- { 0x2D5D1200 /* 45.93.18.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
  { 0x2D712800 /* 45.113.40.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
- { 0x2D869200 /* 45.134.146.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
  { 0x2DC41C00 /* 45.196.28.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0x2DC7B300 /* 45.199.179.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0x2F340000 /* 47.52.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
@@ -103,6 +100,7 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
  { 0x2F780000 /* 47.120.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
  { 0x2F7A0000 /* 47.122.0.0/17 */, 17, NDPI_PROTOCOL_ALIBABA },
  { 0x2F7A8000 /* 47.122.128.0/18 */, 18, NDPI_PROTOCOL_ALIBABA },
+ { 0x2F7AC000 /* 47.122.192.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
  { 0x2F7B0000 /* 47.123.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
  { 0x2FEB0000 /* 47.235.0.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
  { 0x2FEC0000 /* 47.236.0.0/14 */, 14, NDPI_PROTOCOL_ALIBABA },
@@ -137,7 +135,6 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
  { 0x3E3CE000 /* 62.60.224.0/19 */, 19, NDPI_PROTOCOL_ALIBABA },
  { 0x3E806000 /* 62.128.96.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
  { 0x59DB0000 /* 89.219.0.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
- { 0x5BC06B00 /* 91.192.107.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0x5E9ED000 /* 94.158.208.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
  { 0x65250000 /* 101.37.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
  { 0x65840000 /* 101.132.0.0/15 */, 15, NDPI_PROTOCOL_ALIBABA },
@@ -203,7 +200,8 @@ static ndpi_network ndpi_protocol_alibaba_protocol_list[] = {
  { 0xAA215C00 /* 170.33.92.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
  { 0xAA216000 /* 170.33.96.0/21 */, 21, NDPI_PROTOCOL_ALIBABA },
  { 0xAA216800 /* 170.33.104.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
- { 0xB284F000 /* 178.132.240.0/22 */, 22, NDPI_PROTOCOL_ALIBABA },
+ { 0xB284F100 /* 178.132.241.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
+ { 0xB284F200 /* 178.132.242.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
  { 0xB284F400 /* 178.132.244.0/23 */, 23, NDPI_PROTOCOL_ALIBABA },
  { 0xB284F700 /* 178.132.247.0/24 */, 24, NDPI_PROTOCOL_ALIBABA },
  { 0xB65C0000 /* 182.92.0.0/16 */, 16, NDPI_PROTOCOL_ALIBABA },
@@ -258,9 +256,7 @@ static ndpi_network6 ndpi_protocol_alibaba_protocol_list_6[] = {
  { "240b:4003:fd95::", 48, NDPI_PROTOCOL_ALIBABA },
  { "240b:4003:fd96::", 48, NDPI_PROTOCOL_ALIBABA },
  { "240b:4003:fee3::", 48, NDPI_PROTOCOL_ALIBABA },
- { "240b:4004:fffc::", 48, NDPI_PROTOCOL_ALIBABA },
- { "240b:4004:ffff::", 48, NDPI_PROTOCOL_ALIBABA },
- { "240b:4005::", 32, NDPI_PROTOCOL_ALIBABA },
+ { "240b:4004::", 31, NDPI_PROTOCOL_ALIBABA },
  { "240b:4007::", 32, NDPI_PROTOCOL_ALIBABA },
  { "240b:4009::", 32, NDPI_PROTOCOL_ALIBABA },
  { "240b:400b::", 32, NDPI_PROTOCOL_ALIBABA },