diff --git a/data/cncity/330000.txt b/data/cncity/330000.txt index 6d9313d4..0346c370 100644 --- a/data/cncity/330000.txt +++ b/data/cncity/330000.txt @@ -94,12 +94,7 @@ 36.21.109.192/26 36.21.110.0/23 36.21.112.0/20 -36.21.128.0/19 -36.21.160.0/20 -36.21.176.0/22 -36.21.180.0/22 -36.21.184.0/21 -36.21.192.0/18 +36.21.128.0/17 36.22.0.0/18 36.22.64.0/21 36.22.72.0/23 @@ -240,10 +235,7 @@ 36.28.192.0/20 36.28.208.0/21 36.28.216.0/21 -36.28.224.0/21 -36.28.232.0/22 -36.28.236.0/22 -36.28.240.0/20 +36.28.224.0/19 36.29.0.0/16 36.30.0.0/15 36.113.0.0/24 diff --git a/data/cncity/440000.txt b/data/cncity/440000.txt index d158e143..d36406bd 100644 --- a/data/cncity/440000.txt +++ b/data/cncity/440000.txt @@ -745,9 +745,7 @@ 14.26.84.0/22 14.26.88.0/21 14.26.96.0/19 -14.26.128.0/19 -14.26.160.0/19 -14.26.192.0/18 +14.26.128.0/17 14.27.0.0/21 14.27.8.0/22 14.27.12.0/22 @@ -874,11 +872,7 @@ 14.31.72.0/21 14.31.80.0/20 14.31.96.0/19 -14.31.128.0/19 -14.31.160.0/22 -14.31.164.0/22 -14.31.168.0/21 -14.31.176.0/20 +14.31.128.0/18 14.31.192.0/19 14.31.224.0/21 14.31.232.0/21 @@ -1607,10 +1601,7 @@ 39.0.16.0/20 39.0.32.0/19 39.0.64.0/18 -39.0.128.0/20 -39.0.144.0/20 -39.0.160.0/19 -39.0.192.0/18 +39.0.128.0/17 39.108.0.0/16 39.109.120.0/23 39.134.42.0/25 @@ -10920,10 +10911,7 @@ 120.237.172.128/25 120.237.173.0/24 120.237.174.0/23 -120.237.176.0/21 -120.237.184.0/23 -120.237.186.0/23 -120.237.188.0/22 +120.237.176.0/20 120.237.192.0/21 120.237.200.0/29 120.237.200.8/30 diff --git a/data/cncity/460000.txt b/data/cncity/460000.txt index 0a7097d2..5a2d47ce 100644 --- a/data/cncity/460000.txt +++ b/data/cncity/460000.txt @@ -32,16 +32,7 @@ 39.137.61.0/24 39.137.62.0/23 39.144.69.0/24 -43.251.4.0/24 -43.251.5.0/30 -43.251.5.4/31 -43.251.5.6/31 -43.251.5.8/29 -43.251.5.16/28 -43.251.5.32/27 -43.251.5.64/26 -43.251.5.128/25 -43.251.6.0/23 +43.251.4.0/22 59.49.128.0/20 59.49.144.0/20 59.49.160.0/21 diff --git a/data/cncity/610000.txt b/data/cncity/610000.txt index c5afc2f1..6221e385 100644 --- a/data/cncity/610000.txt +++ b/data/cncity/610000.txt @@ -415,20 +415,7 @@ 61.134.48.0/22 61.134.52.0/22 61.134.56.0/21 -61.150.0.0/28 -61.150.0.16/29 -61.150.0.24/31 -61.150.0.26/31 -61.150.0.28/30 -61.150.0.32/27 -61.150.0.64/26 -61.150.0.128/25 -61.150.1.0/24 -61.150.2.0/23 -61.150.4.0/22 -61.150.8.0/21 -61.150.16.0/20 -61.150.32.0/19 +61.150.0.0/18 61.150.64.0/22 61.150.68.0/23 61.150.70.0/23 diff --git a/data/cncity/650000.txt b/data/cncity/650000.txt index f0bcb3ee..3ba86ff6 100644 --- a/data/cncity/650000.txt +++ b/data/cncity/650000.txt @@ -107,13 +107,7 @@ 36.108.0.0/23 36.108.2.0/23 36.108.4.0/22 -36.108.8.0/23 -36.108.10.0/24 -36.108.11.0/28 -36.108.11.16/28 -36.108.11.32/27 -36.108.11.64/26 -36.108.11.128/25 +36.108.8.0/22 36.108.12.0/22 36.108.16.0/22 36.108.20.0/22 diff --git a/data/cncity/654300.txt b/data/cncity/654300.txt index 26c80e92..005d2d9c 100644 --- a/data/cncity/654300.txt +++ b/data/cncity/654300.txt @@ -2,13 +2,7 @@ 36.96.196.0/24 36.105.135.0/24 36.108.6.0/23 -36.108.8.0/23 -36.108.10.0/24 -36.108.11.0/28 -36.108.11.16/28 -36.108.11.32/27 -36.108.11.64/26 -36.108.11.128/25 +36.108.8.0/22 36.108.12.0/23 36.108.225.96/28 36.109.244.0/24 diff --git a/data/country/CN.txt b/data/country/CN.txt index bb444e4b..fbcb1661 100644 --- a/data/country/CN.txt +++ b/data/country/CN.txt @@ -3236,9 +3236,7 @@ 14.26.84.0/22 14.26.88.0/21 14.26.96.0/19 -14.26.128.0/19 -14.26.160.0/19 -14.26.192.0/18 +14.26.128.0/17 14.27.0.0/21 14.27.8.0/22 14.27.12.0/22 @@ -3365,11 +3363,7 @@ 14.31.72.0/21 14.31.80.0/20 14.31.96.0/19 -14.31.128.0/19 -14.31.160.0/22 -14.31.164.0/22 -14.31.168.0/21 -14.31.176.0/20 +14.31.128.0/18 14.31.192.0/19 14.31.224.0/21 14.31.232.0/21 @@ -6484,12 +6478,7 @@ 36.21.109.192/26 36.21.110.0/23 36.21.112.0/20 -36.21.128.0/19 -36.21.160.0/20 -36.21.176.0/22 -36.21.180.0/22 -36.21.184.0/21 -36.21.192.0/18 +36.21.128.0/17 36.22.0.0/18 36.22.64.0/21 36.22.72.0/23 @@ -6630,10 +6619,7 @@ 36.28.192.0/20 36.28.208.0/21 36.28.216.0/21 -36.28.224.0/21 -36.28.232.0/22 -36.28.236.0/22 -36.28.240.0/20 +36.28.224.0/19 36.29.0.0/16 36.30.0.0/15 36.32.0.0/26 @@ -7587,13 +7573,7 @@ 36.108.0.0/23 36.108.2.0/23 36.108.4.0/22 -36.108.8.0/23 -36.108.10.0/24 -36.108.11.0/28 -36.108.11.16/28 -36.108.11.32/27 -36.108.11.64/26 -36.108.11.128/25 +36.108.8.0/22 36.108.12.0/22 36.108.16.0/22 36.108.20.0/22 @@ -11794,10 +11774,7 @@ 39.0.16.0/20 39.0.32.0/19 39.0.64.0/18 -39.0.128.0/20 -39.0.144.0/20 -39.0.160.0/19 -39.0.192.0/18 +39.0.128.0/17 39.64.0.0/18 39.64.64.0/20 39.64.80.0/22 @@ -18113,16 +18090,7 @@ 43.250.216.0/22 43.250.236.0/22 43.250.244.0/22 -43.251.4.0/24 -43.251.5.0/30 -43.251.5.4/31 -43.251.5.6/31 -43.251.5.8/29 -43.251.5.16/28 -43.251.5.32/27 -43.251.5.64/26 -43.251.5.128/25 -43.251.6.0/23 +43.251.4.0/22 43.251.12.0/22 43.251.36.0/22 43.251.100.0/22 @@ -26647,20 +26615,7 @@ 61.149.240.0/22 61.149.244.0/22 61.149.248.0/21 -61.150.0.0/28 -61.150.0.16/29 -61.150.0.24/31 -61.150.0.26/31 -61.150.0.28/30 -61.150.0.32/27 -61.150.0.64/26 -61.150.0.128/25 -61.150.1.0/24 -61.150.2.0/23 -61.150.4.0/22 -61.150.8.0/21 -61.150.16.0/20 -61.150.32.0/19 +61.150.0.0/18 61.150.64.0/22 61.150.68.0/23 61.150.70.0/23 @@ -51764,10 +51719,7 @@ 120.237.172.128/25 120.237.173.0/24 120.237.174.0/23 -120.237.176.0/21 -120.237.184.0/23 -120.237.186.0/23 -120.237.188.0/22 +120.237.176.0/20 120.237.192.0/21 120.237.200.0/29 120.237.200.8/30 diff --git a/data/country/CN/CN-GD.txt b/data/country/CN/CN-GD.txt index d158e143..d36406bd 100644 --- a/data/country/CN/CN-GD.txt +++ b/data/country/CN/CN-GD.txt @@ -745,9 +745,7 @@ 14.26.84.0/22 14.26.88.0/21 14.26.96.0/19 -14.26.128.0/19 -14.26.160.0/19 -14.26.192.0/18 +14.26.128.0/17 14.27.0.0/21 14.27.8.0/22 14.27.12.0/22 @@ -874,11 +872,7 @@ 14.31.72.0/21 14.31.80.0/20 14.31.96.0/19 -14.31.128.0/19 -14.31.160.0/22 -14.31.164.0/22 -14.31.168.0/21 -14.31.176.0/20 +14.31.128.0/18 14.31.192.0/19 14.31.224.0/21 14.31.232.0/21 @@ -1607,10 +1601,7 @@ 39.0.16.0/20 39.0.32.0/19 39.0.64.0/18 -39.0.128.0/20 -39.0.144.0/20 -39.0.160.0/19 -39.0.192.0/18 +39.0.128.0/17 39.108.0.0/16 39.109.120.0/23 39.134.42.0/25 @@ -10920,10 +10911,7 @@ 120.237.172.128/25 120.237.173.0/24 120.237.174.0/23 -120.237.176.0/21 -120.237.184.0/23 -120.237.186.0/23 -120.237.188.0/22 +120.237.176.0/20 120.237.192.0/21 120.237.200.0/29 120.237.200.8/30 diff --git a/data/country/CN/CN-HI.txt b/data/country/CN/CN-HI.txt index 0a7097d2..5a2d47ce 100644 --- a/data/country/CN/CN-HI.txt +++ b/data/country/CN/CN-HI.txt @@ -32,16 +32,7 @@ 39.137.61.0/24 39.137.62.0/23 39.144.69.0/24 -43.251.4.0/24 -43.251.5.0/30 -43.251.5.4/31 -43.251.5.6/31 -43.251.5.8/29 -43.251.5.16/28 -43.251.5.32/27 -43.251.5.64/26 -43.251.5.128/25 -43.251.6.0/23 +43.251.4.0/22 59.49.128.0/20 59.49.144.0/20 59.49.160.0/21 diff --git a/data/country/CN/CN-SN.txt b/data/country/CN/CN-SN.txt index c5afc2f1..6221e385 100644 --- a/data/country/CN/CN-SN.txt +++ b/data/country/CN/CN-SN.txt @@ -415,20 +415,7 @@ 61.134.48.0/22 61.134.52.0/22 61.134.56.0/21 -61.150.0.0/28 -61.150.0.16/29 -61.150.0.24/31 -61.150.0.26/31 -61.150.0.28/30 -61.150.0.32/27 -61.150.0.64/26 -61.150.0.128/25 -61.150.1.0/24 -61.150.2.0/23 -61.150.4.0/22 -61.150.8.0/21 -61.150.16.0/20 -61.150.32.0/19 +61.150.0.0/18 61.150.64.0/22 61.150.68.0/23 61.150.70.0/23 diff --git a/data/country/CN/CN-XJ.txt b/data/country/CN/CN-XJ.txt index f0bcb3ee..3ba86ff6 100644 --- a/data/country/CN/CN-XJ.txt +++ b/data/country/CN/CN-XJ.txt @@ -107,13 +107,7 @@ 36.108.0.0/23 36.108.2.0/23 36.108.4.0/22 -36.108.8.0/23 -36.108.10.0/24 -36.108.11.0/28 -36.108.11.16/28 -36.108.11.32/27 -36.108.11.64/26 -36.108.11.128/25 +36.108.8.0/22 36.108.12.0/22 36.108.16.0/22 36.108.20.0/22 diff --git a/data/country/CN/CN-ZJ.txt b/data/country/CN/CN-ZJ.txt index 6d9313d4..0346c370 100644 --- a/data/country/CN/CN-ZJ.txt +++ b/data/country/CN/CN-ZJ.txt @@ -94,12 +94,7 @@ 36.21.109.192/26 36.21.110.0/23 36.21.112.0/20 -36.21.128.0/19 -36.21.160.0/20 -36.21.176.0/22 -36.21.180.0/22 -36.21.184.0/21 -36.21.192.0/18 +36.21.128.0/17 36.22.0.0/18 36.22.64.0/21 36.22.72.0/23 @@ -240,10 +235,7 @@ 36.28.192.0/20 36.28.208.0/21 36.28.216.0/21 -36.28.224.0/21 -36.28.232.0/22 -36.28.236.0/22 -36.28.240.0/20 +36.28.224.0/19 36.29.0.0/16 36.30.0.0/15 36.113.0.0/24