diff --git a/data/cncity/110000.txt b/data/cncity/110000.txt index acb28634..e1c4559d 100644 --- a/data/cncity/110000.txt +++ b/data/cncity/110000.txt @@ -1469,16 +1469,7 @@ 36.192.164.0/22 36.192.168.0/23 36.192.170.0/24 -39.96.0.0/16 -39.97.0.0/20 -39.97.16.0/22 -39.97.20.0/23 -39.97.22.0/23 -39.97.24.0/21 -39.97.32.0/19 -39.97.64.0/18 -39.97.128.0/17 -39.98.0.0/15 +39.96.0.0/14 39.100.0.0/17 39.100.128.0/19 39.100.160.0/21 @@ -1611,6 +1602,10 @@ 40.73.208.224/28 40.125.128.0/17 40.126.64.0/18 +40.162.0.0/19 +40.162.64.0/19 +40.162.128.0/19 +40.162.192.0/18 42.50.0.0/16 42.62.0.0/19 42.62.32.0/19 diff --git a/data/cncity/310000.txt b/data/cncity/310000.txt index 467b41d2..33e7db30 100644 --- a/data/cncity/310000.txt +++ b/data/cncity/310000.txt @@ -252,6 +252,7 @@ 40.0.180.0/22 40.0.184.0/22 40.0.188.0/22 +40.0.248.0/21 40.72.0.0/16 40.73.0.0/20 40.73.16.0/22 @@ -271,6 +272,9 @@ 40.73.212.0/22 40.73.216.0/21 40.73.224.0/19 +40.162.32.0/19 +40.162.96.0/19 +40.162.160.0/19 40.198.10.0/24 40.198.16.0/21 40.198.24.0/23 diff --git a/data/cncity/620000.txt b/data/cncity/620000.txt index 49a94986..a3b88aa5 100644 --- a/data/cncity/620000.txt +++ b/data/cncity/620000.txt @@ -1441,20 +1441,7 @@ 221.7.44.0/22 221.7.48.0/23 221.7.50.0/23 -221.7.52.0/26 -221.7.52.64/30 -221.7.52.68/30 -221.7.52.72/29 -221.7.52.80/28 -221.7.52.96/27 -221.7.52.128/25 -221.7.53.0/25 -221.7.53.128/26 -221.7.53.192/27 -221.7.53.224/28 -221.7.53.240/30 -221.7.53.244/30 -221.7.53.248/29 +221.7.52.0/23 221.7.54.0/23 221.7.56.0/23 221.7.58.0/23 @@ -1509,17 +1496,7 @@ 222.57.62.0/23 222.57.64.0/21 222.57.72.0/21 -222.57.80.0/23 -222.57.82.0/25 -222.57.82.128/26 -222.57.82.192/31 -222.57.82.194/31 -222.57.82.196/30 -222.57.82.200/29 -222.57.82.208/28 -222.57.82.224/27 -222.57.83.0/24 -222.57.84.0/22 +222.57.80.0/21 222.57.88.0/22 222.57.92.0/22 222.57.96.0/23 diff --git a/data/cncity/810000.txt b/data/cncity/810000.txt index 108d8385..f7f5f8c2 100644 --- a/data/cncity/810000.txt +++ b/data/cncity/810000.txt @@ -291,9 +291,7 @@ 23.225.72.0/23 23.225.94.0/24 23.225.102.0/24 -23.225.128.0/22 -23.225.132.0/23 -23.225.134.0/23 +23.225.128.0/21 23.225.156.0/24 23.225.171.0/24 23.225.222.0/24 @@ -3454,14 +3452,7 @@ 107.150.118.0/23 107.150.120.0/22 107.150.124.0/23 -107.151.64.0/21 -107.151.72.0/21 -107.151.80.0/20 -107.151.96.0/20 -107.151.112.0/23 -107.151.114.0/23 -107.151.116.0/22 -107.151.120.0/21 +107.151.64.0/18 107.151.195.0/24 107.151.196.0/22 107.151.200.0/21 @@ -6494,10 +6485,7 @@ 203.124.8.0/21 203.129.8.0/22 203.129.64.0/19 -203.131.224.0/20 -203.131.240.0/22 -203.131.244.0/22 -203.131.248.0/21 +203.131.224.0/19 203.132.192.0/20 203.135.128.0/19 203.142.88.0/21 diff --git a/data/country/CN.txt b/data/country/CN.txt index f087ae5a..bb444e4b 100644 --- a/data/country/CN.txt +++ b/data/country/CN.txt @@ -12115,16 +12115,7 @@ 39.91.128.0/18 39.91.192.0/18 39.92.0.0/14 -39.96.0.0/16 -39.97.0.0/20 -39.97.16.0/22 -39.97.20.0/23 -39.97.22.0/23 -39.97.24.0/21 -39.97.32.0/19 -39.97.64.0/18 -39.97.128.0/17 -39.98.0.0/15 +39.96.0.0/14 39.100.0.0/17 39.100.128.0/19 39.100.160.0/21 @@ -16157,6 +16148,7 @@ 40.0.180.0/22 40.0.184.0/22 40.0.188.0/22 +40.0.248.0/21 40.72.0.0/16 40.73.0.0/20 40.73.16.0/22 @@ -16178,6 +16170,9 @@ 40.73.224.0/19 40.125.128.0/17 40.126.64.0/18 +40.162.0.0/18 +40.162.64.0/18 +40.162.128.0/17 40.198.10.0/24 40.198.16.0/21 40.198.24.0/23 @@ -96881,20 +96876,7 @@ 221.7.44.0/22 221.7.48.0/23 221.7.50.0/23 -221.7.52.0/26 -221.7.52.64/30 -221.7.52.68/30 -221.7.52.72/29 -221.7.52.80/28 -221.7.52.96/27 -221.7.52.128/25 -221.7.53.0/25 -221.7.53.128/26 -221.7.53.192/27 -221.7.53.224/28 -221.7.53.240/30 -221.7.53.244/30 -221.7.53.248/29 +221.7.52.0/23 221.7.54.0/23 221.7.56.0/23 221.7.58.0/23 @@ -102630,17 +102612,7 @@ 222.57.62.0/23 222.57.64.0/21 222.57.72.0/21 -222.57.80.0/23 -222.57.82.0/25 -222.57.82.128/26 -222.57.82.192/31 -222.57.82.194/31 -222.57.82.196/30 -222.57.82.200/29 -222.57.82.208/28 -222.57.82.224/27 -222.57.83.0/24 -222.57.84.0/22 +222.57.80.0/21 222.57.88.0/22 222.57.92.0/22 222.57.96.0/23 diff --git a/data/country/CN/CN-BJ.txt b/data/country/CN/CN-BJ.txt index acb28634..e1c4559d 100644 --- a/data/country/CN/CN-BJ.txt +++ b/data/country/CN/CN-BJ.txt @@ -1469,16 +1469,7 @@ 36.192.164.0/22 36.192.168.0/23 36.192.170.0/24 -39.96.0.0/16 -39.97.0.0/20 -39.97.16.0/22 -39.97.20.0/23 -39.97.22.0/23 -39.97.24.0/21 -39.97.32.0/19 -39.97.64.0/18 -39.97.128.0/17 -39.98.0.0/15 +39.96.0.0/14 39.100.0.0/17 39.100.128.0/19 39.100.160.0/21 @@ -1611,6 +1602,10 @@ 40.73.208.224/28 40.125.128.0/17 40.126.64.0/18 +40.162.0.0/19 +40.162.64.0/19 +40.162.128.0/19 +40.162.192.0/18 42.50.0.0/16 42.62.0.0/19 42.62.32.0/19 diff --git a/data/country/CN/CN-GS.txt b/data/country/CN/CN-GS.txt index 49a94986..a3b88aa5 100644 --- a/data/country/CN/CN-GS.txt +++ b/data/country/CN/CN-GS.txt @@ -1441,20 +1441,7 @@ 221.7.44.0/22 221.7.48.0/23 221.7.50.0/23 -221.7.52.0/26 -221.7.52.64/30 -221.7.52.68/30 -221.7.52.72/29 -221.7.52.80/28 -221.7.52.96/27 -221.7.52.128/25 -221.7.53.0/25 -221.7.53.128/26 -221.7.53.192/27 -221.7.53.224/28 -221.7.53.240/30 -221.7.53.244/30 -221.7.53.248/29 +221.7.52.0/23 221.7.54.0/23 221.7.56.0/23 221.7.58.0/23 @@ -1509,17 +1496,7 @@ 222.57.62.0/23 222.57.64.0/21 222.57.72.0/21 -222.57.80.0/23 -222.57.82.0/25 -222.57.82.128/26 -222.57.82.192/31 -222.57.82.194/31 -222.57.82.196/30 -222.57.82.200/29 -222.57.82.208/28 -222.57.82.224/27 -222.57.83.0/24 -222.57.84.0/22 +222.57.80.0/21 222.57.88.0/22 222.57.92.0/22 222.57.96.0/23 diff --git a/data/country/CN/CN-SH.txt b/data/country/CN/CN-SH.txt index f409814e..33e7db30 100644 --- a/data/country/CN/CN-SH.txt +++ b/data/country/CN/CN-SH.txt @@ -248,6 +248,11 @@ 39.144.48.0/24 39.144.103.0/24 39.144.104.0/23 +40.0.176.0/22 +40.0.180.0/22 +40.0.184.0/22 +40.0.188.0/22 +40.0.248.0/21 40.72.0.0/16 40.73.0.0/20 40.73.16.0/22 @@ -267,6 +272,9 @@ 40.73.212.0/22 40.73.216.0/21 40.73.224.0/19 +40.162.32.0/19 +40.162.96.0/19 +40.162.160.0/19 40.198.10.0/24 40.198.16.0/21 40.198.24.0/23 diff --git a/data/country/HK.txt b/data/country/HK.txt index 108d8385..f7f5f8c2 100644 --- a/data/country/HK.txt +++ b/data/country/HK.txt @@ -291,9 +291,7 @@ 23.225.72.0/23 23.225.94.0/24 23.225.102.0/24 -23.225.128.0/22 -23.225.132.0/23 -23.225.134.0/23 +23.225.128.0/21 23.225.156.0/24 23.225.171.0/24 23.225.222.0/24 @@ -3454,14 +3452,7 @@ 107.150.118.0/23 107.150.120.0/22 107.150.124.0/23 -107.151.64.0/21 -107.151.72.0/21 -107.151.80.0/20 -107.151.96.0/20 -107.151.112.0/23 -107.151.114.0/23 -107.151.116.0/22 -107.151.120.0/21 +107.151.64.0/18 107.151.195.0/24 107.151.196.0/22 107.151.200.0/21 @@ -6494,10 +6485,7 @@ 203.124.8.0/21 203.129.8.0/22 203.129.64.0/19 -203.131.224.0/20 -203.131.240.0/22 -203.131.244.0/22 -203.131.248.0/21 +203.131.224.0/19 203.132.192.0/20 203.135.128.0/19 203.142.88.0/21 diff --git a/data/country/JP.txt b/data/country/JP.txt index 3e319e67..c6a748b0 100644 --- a/data/country/JP.txt +++ b/data/country/JP.txt @@ -2385,21 +2385,12 @@ 106.186.80.0/23 106.186.82.0/27 106.186.82.32/27 -106.186.82.64/27 -106.186.82.96/28 -106.186.82.112/28 +106.186.82.64/26 106.186.82.128/25 106.186.83.0/24 106.186.84.0/22 106.186.88.0/21 -106.186.96.0/21 -106.186.104.0/24 -106.186.105.0/25 -106.186.105.128/26 -106.186.105.192/26 -106.186.106.0/23 -106.186.108.0/22 -106.186.112.0/20 +106.186.96.0/19 106.186.128.0/17 106.187.2.0/23 106.187.4.0/22 @@ -2945,8 +2936,7 @@ 120.72.64.0/20 120.74.0.0/15 120.88.16.0/20 -120.88.48.0/21 -120.88.56.0/21 +120.88.48.0/20 120.89.128.0/17 120.93.0.0/16 120.136.8.0/21 @@ -6976,9 +6966,7 @@ 203.181.16.0/20 203.181.32.0/19 203.181.64.0/19 -203.181.96.0/22 -203.181.100.0/23 -203.181.102.0/23 +203.181.96.0/21 203.181.104.0/22 203.181.108.0/23 203.181.110.0/24 diff --git a/data/country/JP/JP-13.txt b/data/country/JP/JP-13.txt index 4561c857..5e0ada6d 100644 --- a/data/country/JP/JP-13.txt +++ b/data/country/JP/JP-13.txt @@ -659,21 +659,12 @@ 106.186.80.0/23 106.186.82.0/27 106.186.82.32/27 -106.186.82.64/27 -106.186.82.96/28 -106.186.82.112/28 +106.186.82.64/26 106.186.82.128/25 106.186.83.0/24 106.186.84.0/22 106.186.88.0/21 -106.186.96.0/21 -106.186.104.0/24 -106.186.105.0/25 -106.186.105.128/26 -106.186.105.192/26 -106.186.106.0/23 -106.186.108.0/22 -106.186.112.0/20 +106.186.96.0/19 106.186.128.0/17 106.187.2.0/23 106.187.4.0/22 @@ -893,8 +884,7 @@ 119.161.4.0/23 119.235.224.0/20 119.240.0.0/14 -120.88.48.0/21 -120.88.56.0/21 +120.88.48.0/20 121.1.132.0/23 121.1.137.89/32 121.1.137.253/32 @@ -1968,9 +1958,7 @@ 203.141.160.0/19 203.179.80.0/20 203.181.10.0/24 -203.181.96.0/22 -203.181.100.0/23 -203.181.102.0/23 +203.181.96.0/21 203.181.104.0/22 203.181.108.0/23 203.181.110.0/24 diff --git a/data/country/SG.txt b/data/country/SG.txt index 20d16fb4..75211bbf 100644 --- a/data/country/SG.txt +++ b/data/country/SG.txt @@ -2756,17 +2756,7 @@ 116.12.128.0/17 116.14.0.0/15 116.50.60.0/24 -116.51.0.0/20 -116.51.16.0/21 -116.51.24.0/22 -116.51.28.0/23 -116.51.30.0/24 -116.51.31.0/26 -116.51.31.64/26 -116.51.31.128/25 -116.51.32.0/19 -116.51.64.0/18 -116.51.128.0/17 +116.51.0.0/16 116.86.0.0/15 116.88.0.0/16 116.89.0.0/17 @@ -2984,8 +2974,7 @@ 118.193.85.0/24 118.193.88.0/23 118.194.232.0/22 -118.200.0.0/16 -118.201.0.0/16 +118.200.0.0/15 118.214.0.0/23 118.214.64.0/20 118.214.112.0/20 diff --git a/data/country/TH.txt b/data/country/TH.txt index 608735d9..742ab6a9 100644 --- a/data/country/TH.txt +++ b/data/country/TH.txt @@ -610,9 +610,7 @@ 110.77.128.0/17 110.78.0.0/16 110.164.0.0/19 -110.164.32.0/22 -110.164.36.0/22 -110.164.40.0/21 +110.164.32.0/20 110.164.48.0/21 110.164.56.0/22 110.164.60.0/23 diff --git a/data/country/TW.txt b/data/country/TW.txt index c1f36a4d..0dce765c 100644 --- a/data/country/TW.txt +++ b/data/country/TW.txt @@ -2634,8 +2634,7 @@ 61.31.254.176/28 61.31.254.192/26 61.31.255.0/24 -61.56.0.0/19 -61.56.32.0/19 +61.56.0.0/18 61.56.64.0/19 61.56.96.0/19 61.56.128.0/21 @@ -2681,9 +2680,7 @@ 61.57.24.0/21 61.57.32.0/19 61.57.64.0/18 -61.57.128.0/19 -61.57.160.0/20 -61.57.176.0/20 +61.57.128.0/18 61.57.192.0/19 61.57.224.0/19 61.58.0.0/19 @@ -4589,9 +4586,7 @@ 103.49.93.0/24 103.49.126.0/24 103.49.130.110/31 -103.49.133.0/26 -103.49.133.64/26 -103.49.133.128/25 +103.49.133.0/24 103.49.134.0/24 103.51.88.0/23 103.51.90.0/23 diff --git a/data/country/US.txt b/data/country/US.txt index fd042ae7..a19ffcfe 100644 --- a/data/country/US.txt +++ b/data/country/US.txt @@ -13255,7 +13255,9 @@ 40.0.166.0/24 40.0.168.0/23 40.0.172.0/22 -40.0.192.0/18 +40.0.192.0/19 +40.0.224.0/20 +40.0.240.0/21 40.1.0.0/16 40.2.0.0/15 40.4.0.0/14 @@ -14054,7 +14056,10 @@ 40.127.32.0/19 40.127.112.0/20 40.128.0.0/11 -40.160.0.0/12 +40.160.0.0/15 +40.163.0.0/16 +40.164.0.0/14 +40.168.0.0/13 40.176.0.0/13 40.184.0.0/14 40.188.0.0/16 @@ -42528,8 +42533,7 @@ 156.154.228.0/22 156.154.232.0/21 156.154.240.0/20 -156.232.0.0/21 -156.232.8.0/21 +156.232.0.0/20 156.232.32.0/19 156.232.64.0/19 156.232.128.0/17 @@ -50593,8 +50597,7 @@ 192.16.44.0/23 192.16.47.0/24 192.16.54.92/30 -192.16.60.0/23 -192.16.62.0/23 +192.16.60.0/22 192.16.64.0/19 192.16.96.0/20 192.16.112.0/21 diff --git a/data/country/US/US-CA.txt b/data/country/US/US-CA.txt index fa82bc9b..16d5a425 100644 --- a/data/country/US/US-CA.txt +++ b/data/country/US/US-CA.txt @@ -3884,8 +3884,7 @@ 155.190.254.0/24 155.235.58.19/32 156.96.148.0/24 -156.232.0.0/21 -156.232.8.0/21 +156.232.0.0/20 156.232.32.0/19 156.232.64.0/19 156.232.128.0/17 diff --git a/data/special/china.txt b/data/special/china.txt index a930fb84..d9bac47f 100644 --- a/data/special/china.txt +++ b/data/special/china.txt @@ -341,9 +341,11 @@ 39.109.120.0/23 39.128.0.0/10 40.0.176.0/20 +40.0.248.0/21 40.72.0.0/15 40.125.128.0/17 40.126.64.0/18 +40.162.0.0/16 40.198.10.0/24 40.198.16.0/21 40.198.24.0/23