diff --git a/data/cncity/100000.txt b/data/cncity/100000.txt index 4dd6ca2e..1a7a29d2 100644 --- a/data/cncity/100000.txt +++ b/data/cncity/100000.txt @@ -1471,29 +1471,7 @@ 118.84.254.0/23 118.85.0.0/18 118.85.64.0/19 -118.85.117.132/30 -118.85.117.136/29 -118.85.117.144/30 -118.85.117.162/31 -118.85.117.166/31 -118.85.118.12/30 -118.85.118.16/30 -118.85.118.20/31 -118.85.118.24/30 -118.85.118.28/31 -118.85.118.32/30 -118.85.118.40/31 -118.85.118.44/30 -118.85.118.52/30 -118.85.118.56/29 -118.85.118.64/26 -118.85.118.128/25 -118.85.119.0/25 -118.85.119.128/26 -118.85.119.192/27 -118.85.119.224/29 -118.85.119.232/30 -118.85.119.240/28 +118.85.116.0/22 118.85.128.0/30 118.85.128.6/31 118.85.128.8/30 diff --git a/data/cncity/110000.txt b/data/cncity/110000.txt index 9d751862..94bf6c10 100644 --- a/data/cncity/110000.txt +++ b/data/cncity/110000.txt @@ -2005,9 +2005,6 @@ 118.84.194.128/25 118.85.96.0/20 118.85.112.0/22 -118.85.117.252/30 -118.85.118.0/29 -118.85.118.8/30 118.85.120.0/21 118.85.136.0/21 118.85.194.0/24 diff --git a/data/cncity/120000.txt b/data/cncity/120000.txt index f0df8ebc..176ac56b 100644 --- a/data/cncity/120000.txt +++ b/data/cncity/120000.txt @@ -177,7 +177,6 @@ 117.136.1.0/24 117.136.54.0/23 118.28.0.0/15 -118.85.118.22/31 118.89.0.0/21 118.89.210.0/23 118.89.212.0/22 diff --git a/data/cncity/150000.txt b/data/cncity/150000.txt index f4ab40a4..c89104ea 100644 --- a/data/cncity/150000.txt +++ b/data/cncity/150000.txt @@ -234,9 +234,6 @@ 117.137.0.0/16 117.138.0.0/16 117.161.0.0/17 -118.85.116.0/27 -118.85.116.32/30 -118.85.118.48/30 118.230.0.0/17 120.193.128.0/17 121.37.64.0/18 diff --git a/data/cncity/150300.txt b/data/cncity/150300.txt index 5638777a..9f43f15c 100644 --- a/data/cncity/150300.txt +++ b/data/cncity/150300.txt @@ -42,10 +42,6 @@ 116.136.146.0/24 116.204.156.0/23 116.204.159.0/24 -118.85.116.6/31 -118.85.116.10/31 -118.85.116.14/31 -118.85.116.18/31 120.193.136.0/24 120.193.178.0/23 120.193.180.0/23 diff --git a/data/cncity/150800.txt b/data/cncity/150800.txt index 743ee26c..61afa57d 100644 --- a/data/cncity/150800.txt +++ b/data/cncity/150800.txt @@ -65,7 +65,6 @@ 116.135.64.84/30 116.135.64.88/29 116.135.64.96/30 -118.85.116.2/31 120.193.184.0/21 121.56.144.0/20 121.56.160.0/24 diff --git a/data/cncity/152900.txt b/data/cncity/152900.txt index a1ad24b5..10f37883 100644 --- a/data/cncity/152900.txt +++ b/data/cncity/152900.txt @@ -22,8 +22,6 @@ 116.135.64.116/30 116.135.64.120/30 116.136.131.0/24 -118.85.116.22/31 -118.85.116.26/31 120.193.135.0/24 120.193.168.0/22 120.193.172.0/24 diff --git a/data/cncity/330000.txt b/data/cncity/330000.txt index 23c36520..b6245c82 100644 --- a/data/cncity/330000.txt +++ b/data/cncity/330000.txt @@ -435,10 +435,6 @@ 118.84.191.132/30 118.84.191.136/30 118.84.194.32/29 -118.85.117.156/30 -118.85.117.160/31 -118.85.117.164/31 -118.85.117.168/30 118.91.240.0/20 118.178.0.0/16 119.37.192.0/18 diff --git a/data/cncity/330100.txt b/data/cncity/330100.txt index 9f028271..006984b0 100644 --- a/data/cncity/330100.txt +++ b/data/cncity/330100.txt @@ -633,10 +633,6 @@ 118.84.191.132/30 118.84.191.136/30 118.84.194.32/29 -118.85.117.156/31 -118.85.117.160/31 -118.85.117.164/31 -118.85.117.168/31 118.91.240.0/23 118.91.242.0/24 118.91.243.0/28 diff --git a/data/cncity/410000.txt b/data/cncity/410000.txt index 456a29fd..9562a20e 100644 --- a/data/cncity/410000.txt +++ b/data/cncity/410000.txt @@ -170,9 +170,6 @@ 117.160.0.0/16 118.26.115.0/24 118.66.112.0/23 -118.85.118.30/31 -118.85.118.36/30 -118.85.118.42/31 119.31.192.0/19 120.194.0.0/16 120.212.0.0/14 diff --git a/data/cncity/410100.txt b/data/cncity/410100.txt index b5f33d1c..83c95a53 100644 --- a/data/cncity/410100.txt +++ b/data/cncity/410100.txt @@ -649,9 +649,6 @@ 117.158.214.254/32 117.158.217.247/32 118.66.112.0/23 -118.85.118.30/31 -118.85.118.36/30 -118.85.118.42/31 120.194.0.0/19 120.194.181.0/24 120.219.0.0/19 diff --git a/data/cncity/440000.txt b/data/cncity/440000.txt index 8528300d..7f5f7c36 100644 --- a/data/cncity/440000.txt +++ b/data/cncity/440000.txt @@ -945,20 +945,6 @@ 118.84.191.48/30 118.84.191.80/30 118.84.191.112/31 -118.85.116.36/30 -118.85.116.40/29 -118.85.116.48/28 -118.85.116.64/26 -118.85.116.128/25 -118.85.117.0/25 -118.85.117.128/30 -118.85.117.172/30 -118.85.117.176/28 -118.85.117.192/27 -118.85.117.224/28 -118.85.117.240/29 -118.85.117.248/30 -118.85.119.236/30 118.85.192.0/28 118.85.192.192/27 118.85.193.14/31 diff --git a/data/cncity/440100.txt b/data/cncity/440100.txt index 422bc4cf..35204365 100644 --- a/data/cncity/440100.txt +++ b/data/cncity/440100.txt @@ -494,109 +494,6 @@ 110.210.232.0/21 110.210.240.0/20 110.211.224.0/20 -110.211.252.0/26 -110.211.252.64/31 -110.211.252.67/32 -110.211.252.68/31 -110.211.252.71/32 -110.211.252.72/29 -110.211.252.80/28 -110.211.252.96/28 -110.211.252.112/31 -110.211.252.115/32 -110.211.252.116/31 -110.211.252.119/32 -110.211.252.124/31 -110.211.252.127/32 -110.211.252.128/29 -110.211.252.136/30 -110.211.252.140/31 -110.211.252.143/32 -110.211.252.144/31 -110.211.252.147/32 -110.211.252.148/32 -110.211.252.150/31 -110.211.252.152/31 -110.211.252.155/32 -110.211.252.156/30 -110.211.252.160/29 -110.211.252.168/30 -110.211.252.172/31 -110.211.252.175/32 -110.211.252.176/31 -110.211.252.179/32 -110.211.252.180/31 -110.211.252.183/32 -110.211.252.184/29 -110.211.252.192/31 -110.211.252.195/32 -110.211.252.196/30 -110.211.252.200/29 -110.211.252.208/29 -110.211.252.216/30 -110.211.252.220/31 -110.211.252.223/32 -110.211.252.224/31 -110.211.252.227/32 -110.211.252.228/30 -110.211.252.232/31 -110.211.252.235/32 -110.211.252.236/31 -110.211.252.239/32 -110.211.252.240/31 -110.211.252.243/32 -110.211.252.244/31 -110.211.252.247/32 -110.211.252.248/31 -110.211.252.251/32 -110.211.252.252/30 -110.211.253.0/27 -110.211.253.32/28 -110.211.253.48/31 -110.211.253.52/30 -110.211.253.60/30 -110.211.253.64/27 -110.211.253.96/29 -110.211.253.104/31 -110.211.253.107/32 -110.211.253.108/30 -110.211.253.112/30 -110.211.253.116/31 -110.211.253.119/32 -110.211.253.120/30 -110.211.253.124/31 -110.211.253.127/32 -110.211.253.128/27 -110.211.253.160/30 -110.211.253.164/31 -110.211.253.168/31 -110.211.253.171/32 -110.211.253.172/30 -110.211.253.176/28 -110.211.253.196/30 -110.211.253.200/29 -110.211.253.208/28 -110.211.253.228/30 -110.211.253.232/31 -110.211.253.236/30 -110.211.253.240/28 -110.211.255.32/29 -110.211.255.52/30 -110.211.255.56/29 -110.211.255.144/29 -110.211.255.168/29 -110.211.255.180/30 -110.211.255.184/29 -110.211.255.192/30 -110.211.255.204/30 -110.211.255.224/29 -110.211.255.232/30 -110.211.255.236/32 -110.211.255.238/31 -110.211.255.240/30 -110.211.255.244/32 -110.211.255.246/31 -110.211.255.248/29 111.148.0.0/21 111.149.32.0/19 111.149.64.0/18 @@ -834,7 +731,6 @@ 117.78.64.0/18 117.78.128.0/17 117.101.0.0/16 -117.136.33.32/29 117.180.180.0/23 117.180.185.0/24 117.180.191.128/25 @@ -847,24 +743,6 @@ 118.84.191.48/30 118.84.191.80/30 118.84.191.112/31 -118.85.116.36/30 -118.85.116.40/29 -118.85.116.48/28 -118.85.116.64/30 -118.85.116.84/31 -118.85.116.88/30 -118.85.117.84/31 -118.85.117.104/31 -118.85.117.112/31 -118.85.117.116/31 -118.85.117.120/31 -118.85.117.124/31 -118.85.117.128/31 -118.85.117.172/30 -118.85.117.176/29 -118.85.117.184/30 -118.85.117.224/30 -118.85.119.236/30 118.85.192.0/28 118.85.192.192/27 118.85.193.14/31 @@ -1132,40 +1010,8 @@ 120.197.127.64/26 120.197.127.128/25 120.197.197.0/24 -120.197.224.0/25 -120.197.224.128/26 -120.197.224.192/27 -120.197.224.224/29 -120.197.224.232/31 -120.197.224.234/32 -120.197.224.236/30 -120.197.224.240/28 120.197.225.0/24 120.197.226.0/24 -120.197.227.0/27 -120.197.227.32/28 -120.197.227.48/29 -120.197.227.56/30 -120.197.227.60/31 -120.197.227.63/32 -120.197.227.64/27 -120.197.227.96/28 -120.197.227.116/30 -120.197.227.120/29 -120.197.227.128/26 -120.197.227.192/29 -120.197.227.200/30 -120.197.227.204/31 -120.197.227.207/32 -120.197.227.208/28 -120.197.227.224/27 -120.197.228.0/25 -120.197.228.128/26 -120.197.228.192/27 -120.197.228.224/29 -120.197.228.232/30 -120.197.228.238/31 -120.197.228.240/28 120.197.229.0/24 120.197.230.0/23 120.197.232.0/21 @@ -3047,37 +2893,6 @@ 219.128.182.0/23 219.128.189.0/24 219.128.190.0/23 -219.128.193.0/24 -219.128.194.0/23 -219.128.200.0/22 -219.128.208.0/23 -219.128.211.0/24 -219.128.212.0/24 -219.128.214.0/24 -219.128.216.0/22 -219.128.220.0/23 -219.128.222.0/26 -219.128.222.64/27 -219.128.222.96/28 -219.128.222.118/31 -219.128.222.130/31 -219.128.222.134/31 -219.128.222.138/31 -219.128.222.142/31 -219.128.222.146/31 -219.128.222.150/31 -219.128.222.154/31 -219.128.222.158/31 -219.128.222.162/31 -219.128.222.166/31 -219.128.222.170/31 -219.128.222.174/31 -219.128.222.178/31 -219.128.222.182/31 -219.128.222.186/31 -219.128.222.188/30 -219.128.222.192/26 -219.128.223.0/24 219.135.96.0/21 219.135.128.0/18 219.135.192.0/19 diff --git a/data/cncity/440200.txt b/data/cncity/440200.txt index 530c99e2..b0ac2406 100644 --- a/data/cncity/440200.txt +++ b/data/cncity/440200.txt @@ -35,7 +35,6 @@ 110.208.64.0/18 110.208.176.0/24 110.209.0.0/19 -110.211.254.128/26 111.148.72.0/22 111.148.120.0/22 111.148.168.0/21 @@ -179,7 +178,6 @@ 211.161.16.0/22 218.15.32.0/19 218.204.234.0/23 -219.128.222.160/31 219.129.80.0/20 219.129.96.0/19 219.129.240.0/20 diff --git a/data/cncity/440300.txt b/data/cncity/440300.txt index 75b19c3f..9f369b51 100644 --- a/data/cncity/440300.txt +++ b/data/cncity/440300.txt @@ -520,15 +520,6 @@ 110.210.124.0/24 110.211.32.0/20 110.211.128.0/20 -110.211.252.66/32 -110.211.252.70/32 -110.211.252.114/32 -110.211.252.118/32 -110.211.252.120/30 -110.211.252.126/32 -110.211.252.234/32 -110.211.252.238/32 -110.211.252.242/32 111.148.16.0/21 111.148.192.0/21 111.149.0.0/19 @@ -710,22 +701,8 @@ 117.61.245.0/24 117.132.192.0/24 117.132.198.0/24 -117.136.33.128/27 -117.136.33.168/29 -117.136.33.176/28 -117.136.33.192/30 -117.136.33.200/29 -117.136.33.208/28 -117.136.33.224/28 -117.136.33.240/30 117.136.40.0/24 118.25.200.0/21 -118.85.116.68/30 -118.85.116.72/29 -118.85.116.80/30 -118.85.117.188/30 -118.85.117.192/29 -118.85.117.200/30 118.85.210.64/28 118.89.250.0/23 118.89.252.0/22 @@ -818,13 +795,6 @@ 120.196.109.160/28 120.196.109.192/26 120.196.112.0/24 -120.196.117.0/26 -120.196.117.64/29 -120.196.117.74/31 -120.196.117.76/30 -120.196.117.80/28 -120.196.117.96/27 -120.196.117.128/25 120.196.120.0/24 120.196.121.0/25 120.196.121.128/28 @@ -1392,17 +1362,6 @@ 183.38.192.0/22 183.38.196.0/23 183.38.198.0/24 -183.38.200.0/22 -183.38.204.0/26 -183.38.204.64/27 -183.38.204.96/28 -183.38.204.112/30 -183.38.204.117/32 -183.38.204.118/31 -183.38.204.120/29 -183.38.204.128/25 -183.38.205.0/24 -183.38.207.0/24 183.38.208.0/20 183.38.224.0/19 183.39.0.0/20 @@ -1850,7 +1809,6 @@ 219.128.137.0/24 219.128.146.0/24 219.128.184.0/22 -219.128.192.0/24 219.133.0.0/16 219.134.0.0/16 219.223.0.0/16 diff --git a/data/cncity/440400.txt b/data/cncity/440400.txt index df2c584f..ee5d7de9 100644 --- a/data/cncity/440400.txt +++ b/data/cncity/440400.txt @@ -74,7 +74,6 @@ 110.208.156.0/23 110.208.158.0/24 110.211.48.0/20 -110.211.254.64/26 111.148.64.0/22 112.89.72.0/22 112.90.64.0/21 @@ -114,12 +113,6 @@ 116.194.176.0/23 116.194.178.0/24 116.254.201.0/24 -118.85.116.196/30 -118.85.116.200/29 -118.85.116.208/30 -118.85.117.236/30 -118.85.117.240/29 -118.85.117.248/30 119.2.240.0/21 119.2.248.0/22 119.2.252.0/23 @@ -233,38 +226,9 @@ 183.234.150.186/32 183.235.84.0/22 183.235.212.0/22 -183.239.32.0/26 -183.239.32.64/30 -183.239.32.68/31 -183.239.32.71/32 -183.239.32.72/29 -183.239.32.80/28 -183.239.32.96/27 -183.239.32.132/30 -183.239.32.136/29 -183.239.32.144/28 -183.239.32.160/27 -183.239.32.192/26 183.239.33.0/24 183.239.34.0/23 183.239.36.0/24 -183.239.37.0/25 -183.239.37.128/27 -183.239.37.160/28 -183.239.37.180/30 -183.239.37.184/29 -183.239.37.192/27 -183.239.37.224/31 -183.239.37.226/32 -183.239.37.228/30 -183.239.37.232/29 -183.239.38.0/26 -183.239.38.64/31 -183.239.38.68/30 -183.239.38.72/29 -183.239.38.80/28 -183.239.38.96/27 -183.239.38.128/25 183.239.39.0/24 202.96.132.0/23 202.96.178.0/24 @@ -284,9 +248,6 @@ 218.104.192.0/21 218.204.208.0/20 219.128.80.0/21 -219.128.222.112/32 -219.128.222.115/32 -219.128.222.140/31 219.131.176.0/20 219.131.192.0/18 219.135.64.0/20 diff --git a/data/cncity/440500.txt b/data/cncity/440500.txt index 910c09ff..ee7097b3 100644 --- a/data/cncity/440500.txt +++ b/data/cncity/440500.txt @@ -92,9 +92,6 @@ 116.31.128.0/18 116.194.73.0/24 116.194.206.0/24 -118.85.116.152/31 -118.85.116.158/31 -118.85.116.162/31 119.19.0.0/16 119.121.0.0/22 119.121.4.0/23 @@ -315,7 +312,6 @@ 183.234.224.66/31 183.234.227.209/32 183.235.32.0/22 -183.235.53.16/30 183.235.160.0/21 183.235.168.0/22 183.237.98.116/31 @@ -444,17 +440,12 @@ 219.128.172.0/23 219.128.181.0/24 219.128.188.0/24 -219.128.197.0/24 -219.128.198.0/23 -219.128.204.0/22 -219.128.222.144/31 +219.128.192.0/19 219.131.112.0/22 219.131.120.0/22 221.5.3.0/24 -221.5.7.52/30 -221.5.7.72/30 -221.5.8.8/29 -221.5.8.154/31 +221.5.7.0/24 +221.5.8.0/24 221.5.13.0/24 221.172.248.0/24 221.179.40.147/32 diff --git a/data/cncity/440600.txt b/data/cncity/440600.txt index 0b2b8dc4..1fe80f71 100644 --- a/data/cncity/440600.txt +++ b/data/cncity/440600.txt @@ -47,14 +47,6 @@ 58.254.208.0/21 58.254.216.0/22 58.254.238.0/23 -58.254.240.0/25 -58.254.240.128/26 -58.254.240.192/27 -58.254.240.224/28 -58.254.240.240/31 -58.254.240.242/32 -58.254.240.244/30 -58.254.240.248/29 58.254.241.0/24 58.255.161.0/24 58.255.162.0/23 @@ -66,8 +58,7 @@ 58.255.252.0/23 59.36.200.0/21 59.36.224.0/20 -59.37.40.0/24 -59.37.41.130/32 +59.37.40.0/23 59.37.48.0/23 59.37.80.0/20 59.38.64.0/19 @@ -115,9 +106,7 @@ 110.209.123.0/24 110.210.96.0/24 110.211.96.0/20 -110.211.252.194/32 -110.211.252.222/32 -110.211.252.226/32 +110.211.240.0/20 111.148.40.0/22 112.89.76.0/22 112.90.152.0/21 @@ -162,15 +151,7 @@ 116.60.24.0/22 116.60.224.0/21 117.136.31.32/27 -117.136.33.64/29 -117.136.33.76/30 -117.136.33.80/29 117.136.41.16/28 -118.85.116.100/30 -118.85.116.104/29 -118.85.116.112/30 -118.85.117.228/30 -118.85.117.232/30 119.63.32.0/19 119.126.0.0/17 119.126.128.0/18 @@ -206,7 +187,7 @@ 120.87.96.0/19 120.87.128.0/18 120.196.8.0/23 -120.196.117.72/31 +120.196.117.0/24 120.196.118.0/23 120.196.131.0/24 120.196.176.0/21 @@ -216,11 +197,9 @@ 120.197.199.0/24 120.197.200.0/21 120.197.208.0/20 -120.197.224.235/32 -120.197.227.62/32 -120.197.227.112/30 -120.197.227.206/32 -120.197.228.236/31 +120.197.224.0/24 +120.197.227.0/24 +120.197.228.0/24 120.230.41.0/24 120.230.42.0/23 120.230.44.0/22 @@ -244,12 +223,8 @@ 120.237.8.0/21 120.237.136.0/21 120.237.144.0/21 -120.237.168.60/32 -120.237.168.150/31 -120.237.169.176/30 -120.237.170.50/32 -120.237.171.63/32 -120.237.172.16/31 +120.237.168.0/22 +120.237.172.0/24 120.239.51.0/24 120.239.52.0/22 120.239.56.0/22 @@ -362,7 +337,7 @@ 157.61.153.0/24 157.61.154.0/23 157.61.156.0/22 -157.122.157.140/30 +157.122.157.0/24 160.19.208.0/22 160.22.188.0/24 163.142.128.0/17 @@ -378,8 +353,7 @@ 183.28.0.0/16 183.38.20.0/24 183.38.199.0/24 -183.38.204.116/32 -183.38.206.0/24 +183.38.200.0/21 183.47.61.0/24 183.47.200.0/21 183.47.224.0/21 @@ -430,14 +404,7 @@ 183.233.176.0/22 183.234.44.0/22 183.234.48.0/22 -183.235.52.0/24 -183.235.53.0/28 -183.235.53.20/30 -183.235.53.24/29 -183.235.53.32/27 -183.235.53.64/26 -183.235.53.128/25 -183.235.54.0/23 +183.235.52.0/22 183.235.56.0/21 183.235.112.0/22 183.235.188.0/22 @@ -448,29 +415,21 @@ 183.237.176.0/22 183.238.80.0/22 183.238.192.0/21 -183.239.32.70/32 -183.239.32.128/30 -183.239.37.176/30 -183.239.37.227/32 -183.239.37.240/28 -183.239.38.66/31 -183.239.40.132/30 -183.239.43.147/32 +183.239.32.0/24 +183.239.37.0/24 +183.239.38.0/24 +183.239.40.0/24 +183.239.43.0/24 183.239.44.120/29 -183.239.45.23/32 -183.239.45.104/32 -183.239.47.128/31 -183.239.48.50/32 -183.239.49.0/24 -183.239.51.13/32 -183.239.51.51/32 -183.239.52.144/30 -183.239.53.0/24 +183.239.45.0/24 +183.239.47.0/24 +183.239.48.0/23 +183.239.51.0/24 +183.239.52.0/23 183.239.55.0/24 -183.239.57.98/31 -183.239.60.16/30 -183.239.60.21/32 -183.239.63.190/32 +183.239.57.0/24 +183.239.60.0/24 +183.239.63.0/24 183.240.0.0/21 183.240.160.0/21 183.240.216.0/22 @@ -539,7 +498,6 @@ 219.128.104.0/21 219.128.120.0/21 219.128.148.0/24 -219.128.222.116/31 219.128.224.0/19 219.130.176.0/20 219.130.192.0/18 @@ -569,25 +527,6 @@ 221.5.2.0/24 221.5.4.0/23 221.5.6.0/24 -221.5.7.0/27 -221.5.7.32/28 -221.5.7.48/30 -221.5.7.56/29 -221.5.7.64/29 -221.5.7.76/30 -221.5.7.80/28 -221.5.7.96/27 -221.5.7.128/25 -221.5.8.0/29 -221.5.8.16/28 -221.5.8.32/27 -221.5.8.64/26 -221.5.8.128/28 -221.5.8.144/29 -221.5.8.152/31 -221.5.8.156/30 -221.5.8.160/27 -221.5.8.192/26 221.5.9.0/24 221.5.10.0/23 221.5.12.0/24 @@ -597,13 +536,6 @@ 221.5.65.0/24 221.5.67.0/24 221.5.68.0/23 -221.5.70.0/27 -221.5.70.32/28 -221.5.70.50/31 -221.5.70.52/30 -221.5.70.56/29 -221.5.70.64/26 -221.5.70.128/25 221.5.71.0/24 221.5.72.0/21 221.5.80.0/23 @@ -612,13 +544,6 @@ 221.5.83.128/26 221.5.83.192/27 221.5.84.0/24 -221.5.85.0/27 -221.5.85.32/28 -221.5.85.48/30 -221.5.85.52/31 -221.5.85.56/29 -221.5.85.64/26 -221.5.85.128/25 221.5.86.0/23 221.5.88.0/21 221.5.96.0/19 diff --git a/data/cncity/440700.txt b/data/cncity/440700.txt index 38031140..76d35d8e 100644 --- a/data/cncity/440700.txt +++ b/data/cncity/440700.txt @@ -33,14 +33,6 @@ 59.37.28.0/22 59.37.34.0/23 59.37.36.0/23 -59.37.41.0/25 -59.37.41.128/31 -59.37.41.131/32 -59.37.41.132/30 -59.37.41.136/29 -59.37.41.144/28 -59.37.41.160/27 -59.37.41.192/26 59.37.42.0/23 59.37.44.0/22 59.37.160.0/21 @@ -64,9 +56,6 @@ 110.120.0.0/21 110.120.56.0/21 110.211.112.0/20 -110.211.253.192/30 -110.211.253.224/30 -110.211.253.234/31 111.148.76.0/22 112.89.48.0/23 112.89.50.0/24 @@ -89,9 +78,6 @@ 116.27.96.0/19 116.27.128.0/17 116.194.144.0/24 -118.85.116.132/30 -118.85.116.136/29 -118.85.116.144/30 118.245.146.0/24 119.2.128.0/20 119.2.176.0/22 @@ -357,7 +343,6 @@ 218.14.128.0/18 218.204.180.0/22 218.204.184.0/22 -219.128.222.124/30 219.130.128.0/19 219.130.160.0/20 220.242.0.0/23 diff --git a/data/cncity/440800.txt b/data/cncity/440800.txt index 2f6375ba..1579d5bb 100644 --- a/data/cncity/440800.txt +++ b/data/cncity/440800.txt @@ -43,13 +43,6 @@ 110.120.108.0/22 110.120.120.0/21 110.120.128.0/21 -110.211.253.50/31 -110.211.253.56/30 -110.211.255.196/30 -110.211.255.200/30 -110.211.255.208/28 -110.211.255.237/32 -110.211.255.245/32 111.148.92.0/22 111.148.96.0/21 111.148.104.0/22 @@ -83,10 +76,6 @@ 116.28.176.0/20 116.28.192.0/18 116.60.160.0/22 -118.85.116.246/31 -118.85.116.250/31 -118.85.116.254/31 -118.85.117.2/31 119.121.73.0/24 119.135.0.0/18 119.135.64.0/19 @@ -538,9 +527,6 @@ 211.156.240.0/20 218.14.192.0/18 218.204.196.0/22 -219.128.222.113/32 -219.128.222.114/32 -219.128.222.132/31 219.129.0.0/18 219.129.64.0/20 219.132.0.0/18 diff --git a/data/cncity/440900.txt b/data/cncity/440900.txt index de9835e0..6fa4cb40 100644 --- a/data/cncity/440900.txt +++ b/data/cncity/440900.txt @@ -39,8 +39,6 @@ 110.120.240.0/20 110.208.60.0/24 110.210.190.0/23 -110.211.240.0/21 -110.211.254.192/26 111.148.68.0/22 111.148.140.0/22 111.148.148.0/22 @@ -73,14 +71,6 @@ 116.27.64.0/19 116.31.76.0/22 116.60.237.0/24 -118.85.116.214/31 -118.85.116.218/31 -118.85.116.222/31 -118.85.116.226/31 -118.85.117.54/31 -118.85.117.58/31 -118.85.117.62/31 -118.85.117.66/31 118.245.243.0/24 119.2.168.0/21 119.2.196.0/22 @@ -275,7 +265,6 @@ 218.30.131.0/24 219.128.98.0/23 219.128.112.0/21 -219.128.222.164/31 219.129.208.0/20 219.129.224.0/20 219.132.92.0/23 diff --git a/data/cncity/441200.txt b/data/cncity/441200.txt index 8df6f567..a9f470a2 100644 --- a/data/cncity/441200.txt +++ b/data/cncity/441200.txt @@ -35,7 +35,7 @@ 58.254.56.0/22 58.254.60.0/23 58.254.63.0/24 -58.254.240.243/32 +58.254.240.0/24 58.255.240.0/22 58.255.244.0/24 58.255.254.0/23 @@ -61,7 +61,6 @@ 110.208.52.0/22 110.208.251.0/24 110.211.192.0/20 -110.211.254.0/26 111.148.152.0/22 112.89.80.0/23 112.89.82.0/24 @@ -79,10 +78,6 @@ 116.19.160.0/19 116.19.192.0/18 116.194.139.0/24 -118.85.117.118/31 -118.85.117.122/31 -118.85.117.126/31 -118.85.117.130/31 119.2.180.0/22 119.125.128.0/17 119.140.240.0/22 @@ -238,7 +233,6 @@ 218.15.208.0/20 218.15.224.0/19 218.204.236.0/23 -219.128.222.128/31 219.131.80.0/20 219.131.96.0/20 220.114.204.0/22 @@ -249,9 +243,9 @@ 220.198.8.0/21 221.5.64.0/24 221.5.66.0/24 -221.5.70.48/31 +221.5.70.0/24 221.5.83.224/27 -221.5.85.54/31 +221.5.85.0/24 221.179.88.195/32 222.50.136.0/21 223.73.76.0/22 diff --git a/data/cncity/441300.txt b/data/cncity/441300.txt index 6de22aa4..260b0a98 100644 --- a/data/cncity/441300.txt +++ b/data/cncity/441300.txt @@ -73,9 +73,6 @@ 110.208.48.0/23 110.211.64.0/20 110.211.160.0/20 -110.211.253.106/32 -110.211.253.118/32 -110.211.253.126/32 111.148.44.0/22 111.148.48.0/22 111.148.204.0/22 @@ -126,11 +123,6 @@ 116.19.22.0/23 116.19.137.0/24 116.194.32.0/24 -117.136.33.88/30 -117.136.33.196/30 -118.85.116.116/30 -118.85.116.120/29 -118.85.116.128/30 119.124.0.0/17 119.124.128.0/19 119.124.160.0/20 @@ -398,7 +390,6 @@ 218.204.224.0/22 219.128.141.0/24 219.128.149.0/24 -219.128.222.172/31 219.131.0.0/18 219.131.64.0/20 219.132.90.0/23 diff --git a/data/cncity/441400.txt b/data/cncity/441400.txt index b4344cc5..bd85e195 100644 --- a/data/cncity/441400.txt +++ b/data/cncity/441400.txt @@ -48,8 +48,6 @@ 61.242.71.0/24 61.242.72.0/22 110.208.220.0/23 -110.211.248.0/22 -110.211.255.64/26 111.148.84.0/22 111.148.112.0/22 112.89.60.0/23 @@ -77,14 +75,6 @@ 116.16.32.0/20 116.19.34.0/23 116.19.143.0/24 -118.85.116.230/31 -118.85.116.234/31 -118.85.116.238/31 -118.85.116.242/31 -118.85.117.38/31 -118.85.117.42/31 -118.85.117.46/31 -118.85.117.50/31 119.125.0.0/17 119.132.240.0/21 119.146.120.0/22 @@ -380,7 +370,6 @@ 218.204.238.0/24 219.128.64.0/22 219.128.68.0/23 -219.128.222.156/31 219.132.128.0/19 219.132.160.0/20 220.198.51.0/24 diff --git a/data/cncity/441500.txt b/data/cncity/441500.txt index f7a97ced..34a07e90 100644 --- a/data/cncity/441500.txt +++ b/data/cncity/441500.txt @@ -203,7 +203,6 @@ 218.13.62.0/23 218.15.112.0/20 218.204.232.0/24 -219.128.222.176/31 219.129.160.0/20 221.179.115.144/29 223.73.24.0/22 diff --git a/data/cncity/441600.txt b/data/cncity/441600.txt index b33f1b2d..a69a1630 100644 --- a/data/cncity/441600.txt +++ b/data/cncity/441600.txt @@ -301,7 +301,6 @@ 218.204.233.0/24 219.128.92.0/22 219.128.100.0/23 -219.128.222.136/31 219.129.128.0/19 220.198.250.0/23 220.198.252.0/23 diff --git a/data/cncity/441700.txt b/data/cncity/441700.txt index d5825905..6f495435 100644 --- a/data/cncity/441700.txt +++ b/data/cncity/441700.txt @@ -33,11 +33,6 @@ 61.146.80.0/21 61.146.88.0/22 61.235.69.0/24 -110.211.255.128/29 -110.211.255.136/30 -110.211.255.152/29 -110.211.255.160/29 -110.211.255.176/30 111.148.80.0/22 111.148.116.0/22 111.148.160.0/22 @@ -57,10 +52,6 @@ 116.29.0.0/18 116.29.64.0/19 116.60.59.0/24 -118.85.117.86/31 -118.85.117.90/31 -118.85.117.94/31 -118.85.117.98/31 119.132.208.0/20 119.132.224.0/20 119.132.248.0/21 @@ -163,7 +154,6 @@ 210.77.127.0/24 211.139.250.0/23 218.15.128.0/20 -219.128.222.180/31 219.129.176.0/20 219.129.192.0/20 219.131.152.0/22 diff --git a/data/cncity/441800.txt b/data/cncity/441800.txt index 9d9600e6..a9780d89 100644 --- a/data/cncity/441800.txt +++ b/data/cncity/441800.txt @@ -38,9 +38,6 @@ 61.234.114.0/24 61.235.113.0/24 110.211.176.0/20 -110.211.255.0/27 -110.211.255.40/29 -110.211.255.48/30 111.148.88.0/22 111.148.136.0/22 111.148.176.0/22 @@ -378,7 +375,6 @@ 218.16.128.0/20 218.204.191.0/24 218.204.230.0/23 -219.128.222.152/31 219.131.116.0/22 219.132.80.0/21 219.132.88.0/23 diff --git a/data/cncity/441900.txt b/data/cncity/441900.txt index 3ffdd7f2..082dc216 100644 --- a/data/cncity/441900.txt +++ b/data/cncity/441900.txt @@ -143,15 +143,6 @@ 110.210.76.0/24 110.211.0.0/19 110.211.208.0/20 -110.211.252.142/32 -110.211.252.146/32 -110.211.252.149/32 -110.211.252.154/32 -110.211.252.174/32 -110.211.252.178/32 -110.211.252.182/32 -110.211.252.246/32 -110.211.252.250/32 111.148.8.0/21 112.89.36.0/23 112.89.38.0/24 @@ -221,15 +212,7 @@ 116.19.8.0/22 116.19.132.0/24 116.60.18.0/24 -117.136.33.40/29 -117.136.33.48/28 -117.136.33.92/30 -117.136.33.96/27 -118.85.116.92/30 -118.85.116.96/30 -118.85.117.204/30 -118.85.117.208/29 -118.85.117.216/30 +117.136.33.0/24 119.127.64.0/18 119.127.128.0/17 119.128.0.0/16 @@ -622,75 +605,15 @@ 183.238.128.0/21 183.238.136.0/22 183.238.160.0/22 -183.239.40.0/25 -183.239.40.128/30 -183.239.40.136/29 -183.239.40.144/28 -183.239.40.160/27 -183.239.40.192/26 183.239.41.0/24 183.239.42.0/24 -183.239.43.0/25 -183.239.43.128/28 -183.239.43.144/31 -183.239.43.146/32 -183.239.43.148/30 -183.239.43.152/29 -183.239.43.160/27 -183.239.43.192/26 183.239.44.0/26 183.239.44.64/27 183.239.44.96/28 183.239.44.112/29 183.239.44.128/25 -183.239.45.0/28 -183.239.45.16/30 -183.239.45.20/31 -183.239.45.22/32 -183.239.45.24/29 -183.239.45.32/27 -183.239.45.64/27 -183.239.45.96/29 -183.239.45.105/32 -183.239.45.106/31 -183.239.45.108/30 -183.239.45.112/28 -183.239.45.128/25 183.239.46.0/24 -183.239.47.0/25 -183.239.47.130/31 -183.239.47.132/30 -183.239.47.136/29 -183.239.47.144/28 -183.239.47.160/27 -183.239.47.192/26 -183.239.48.0/27 -183.239.48.32/28 -183.239.48.48/31 -183.239.48.51/32 -183.239.48.52/30 -183.239.48.56/29 -183.239.48.64/26 -183.239.48.128/25 183.239.50.0/24 -183.239.51.0/29 -183.239.51.8/30 -183.239.51.12/32 -183.239.51.14/31 -183.239.51.16/28 -183.239.51.32/28 -183.239.51.48/31 -183.239.51.50/32 -183.239.51.52/30 -183.239.51.56/29 -183.239.51.64/26 -183.239.51.128/25 -183.239.52.0/25 -183.239.52.128/28 -183.239.52.148/30 -183.239.52.152/29 -183.239.52.160/27 -183.239.52.192/26 183.239.54.0/24 183.239.96.0/24 183.239.97.0/26 @@ -856,8 +779,6 @@ 218.247.32.0/19 219.128.145.0/24 219.128.147.0/24 -219.128.210.0/24 -219.128.213.0/24 219.130.0.0/17 219.131.124.0/22 219.131.128.0/20 diff --git a/data/cncity/442000.txt b/data/cncity/442000.txt index 4f6748a3..307118b0 100644 --- a/data/cncity/442000.txt +++ b/data/cncity/442000.txt @@ -55,9 +55,6 @@ 110.210.225.0/24 110.210.226.0/23 110.211.80.0/20 -110.211.253.166/31 -110.211.253.170/32 -110.211.255.140/30 111.148.36.0/22 111.148.128.0/21 111.148.144.0/22 @@ -108,9 +105,6 @@ 116.60.204.0/23 116.194.77.0/24 116.194.227.0/24 -118.85.116.180/30 -118.85.116.184/29 -118.85.116.192/30 119.38.129.0/24 119.38.130.0/23 119.38.132.0/22 @@ -302,12 +296,6 @@ 157.122.148.0/22 157.122.152.0/22 157.122.156.0/24 -157.122.157.0/25 -157.122.157.128/29 -157.122.157.136/30 -157.122.157.144/28 -157.122.157.160/27 -157.122.157.192/26 157.122.158.0/23 157.122.160.0/21 157.122.168.0/23 @@ -369,31 +357,9 @@ 183.238.84.0/22 183.238.88.0/21 183.239.56.0/24 -183.239.57.0/26 -183.239.57.64/27 -183.239.57.96/31 -183.239.57.100/30 -183.239.57.104/29 -183.239.57.112/28 -183.239.57.128/25 183.239.58.0/23 -183.239.60.0/28 -183.239.60.20/32 -183.239.60.22/31 -183.239.60.24/29 -183.239.60.32/27 -183.239.60.64/26 -183.239.60.128/25 183.239.61.0/24 183.239.62.0/24 -183.239.63.0/25 -183.239.63.128/27 -183.239.63.160/28 -183.239.63.176/29 -183.239.63.184/30 -183.239.63.188/31 -183.239.63.191/32 -183.239.63.192/26 183.239.64.0/21 183.239.75.0/24 202.96.186.0/23 @@ -412,7 +378,6 @@ 218.204.176.0/22 219.128.0.0/18 219.128.150.0/24 -219.128.222.120/30 221.4.192.0/20 221.172.96.0/21 222.17.28.0/22 diff --git a/data/cncity/445100.txt b/data/cncity/445100.txt index db93c18c..bdd4331d 100644 --- a/data/cncity/445100.txt +++ b/data/cncity/445100.txt @@ -70,11 +70,6 @@ 116.19.38.0/24 116.194.74.0/24 116.194.240.0/24 -117.136.33.0/27 -118.85.116.166/31 -118.85.116.170/31 -118.85.116.174/31 -118.85.116.178/31 119.120.192.0/18 119.142.176.0/20 119.142.192.0/18 @@ -143,7 +138,6 @@ 218.15.64.0/22 218.15.92.0/22 219.128.97.0/24 -219.128.222.148/31 219.131.144.0/21 219.131.156.0/22 220.249.204.0/24 diff --git a/data/cncity/445200.txt b/data/cncity/445200.txt index bf5f3018..2fedfd1d 100644 --- a/data/cncity/445200.txt +++ b/data/cncity/445200.txt @@ -230,7 +230,6 @@ 218.16.160.0/20 218.192.64.0/21 218.204.228.0/23 -219.128.222.168/31 219.132.112.0/20 219.222.112.0/20 220.198.254.0/23 diff --git a/data/cncity/445300.txt b/data/cncity/445300.txt index 9a5c9505..c60dd5c1 100644 --- a/data/cncity/445300.txt +++ b/data/cncity/445300.txt @@ -74,10 +74,6 @@ 116.29.96.0/19 116.29.128.0/20 116.29.144.0/21 -118.85.117.102/31 -118.85.117.106/31 -118.85.117.110/31 -118.85.117.114/31 119.138.160.0/19 119.138.192.0/18 119.140.64.0/19 @@ -154,7 +150,6 @@ 218.15.192.0/20 218.16.176.0/21 218.204.190.0/24 -219.128.222.184/31 219.131.160.0/20 221.4.154.0/23 221.4.156.0/23 diff --git a/data/cncity/460000.txt b/data/cncity/460000.txt index 56b65857..66ac7df4 100644 --- a/data/cncity/460000.txt +++ b/data/cncity/460000.txt @@ -43,8 +43,6 @@ 117.126.0.0/16 117.136.13.0/24 118.84.253.0/24 -118.85.117.148/30 -118.85.117.152/30 119.41.0.0/16 121.58.0.0/17 123.95.0.0/17 diff --git a/data/country/CN/CN-BJ.txt b/data/country/CN/CN-BJ.txt index 9d751862..94bf6c10 100644 --- a/data/country/CN/CN-BJ.txt +++ b/data/country/CN/CN-BJ.txt @@ -2005,9 +2005,6 @@ 118.84.194.128/25 118.85.96.0/20 118.85.112.0/22 -118.85.117.252/30 -118.85.118.0/29 -118.85.118.8/30 118.85.120.0/21 118.85.136.0/21 118.85.194.0/24 diff --git a/data/country/CN/CN-GD.txt b/data/country/CN/CN-GD.txt index 8528300d..7f5f7c36 100644 --- a/data/country/CN/CN-GD.txt +++ b/data/country/CN/CN-GD.txt @@ -945,20 +945,6 @@ 118.84.191.48/30 118.84.191.80/30 118.84.191.112/31 -118.85.116.36/30 -118.85.116.40/29 -118.85.116.48/28 -118.85.116.64/26 -118.85.116.128/25 -118.85.117.0/25 -118.85.117.128/30 -118.85.117.172/30 -118.85.117.176/28 -118.85.117.192/27 -118.85.117.224/28 -118.85.117.240/29 -118.85.117.248/30 -118.85.119.236/30 118.85.192.0/28 118.85.192.192/27 118.85.193.14/31 diff --git a/data/country/CN/CN-HA.txt b/data/country/CN/CN-HA.txt index 456a29fd..9562a20e 100644 --- a/data/country/CN/CN-HA.txt +++ b/data/country/CN/CN-HA.txt @@ -170,9 +170,6 @@ 117.160.0.0/16 118.26.115.0/24 118.66.112.0/23 -118.85.118.30/31 -118.85.118.36/30 -118.85.118.42/31 119.31.192.0/19 120.194.0.0/16 120.212.0.0/14 diff --git a/data/country/CN/CN-HI.txt b/data/country/CN/CN-HI.txt index 56b65857..66ac7df4 100644 --- a/data/country/CN/CN-HI.txt +++ b/data/country/CN/CN-HI.txt @@ -43,8 +43,6 @@ 117.126.0.0/16 117.136.13.0/24 118.84.253.0/24 -118.85.117.148/30 -118.85.117.152/30 119.41.0.0/16 121.58.0.0/17 123.95.0.0/17 diff --git a/data/country/CN/CN-NM.txt b/data/country/CN/CN-NM.txt index f4ab40a4..c89104ea 100644 --- a/data/country/CN/CN-NM.txt +++ b/data/country/CN/CN-NM.txt @@ -234,9 +234,6 @@ 117.137.0.0/16 117.138.0.0/16 117.161.0.0/17 -118.85.116.0/27 -118.85.116.32/30 -118.85.118.48/30 118.230.0.0/17 120.193.128.0/17 121.37.64.0/18 diff --git a/data/country/CN/CN-TJ.txt b/data/country/CN/CN-TJ.txt index f0df8ebc..176ac56b 100644 --- a/data/country/CN/CN-TJ.txt +++ b/data/country/CN/CN-TJ.txt @@ -177,7 +177,6 @@ 117.136.1.0/24 117.136.54.0/23 118.28.0.0/15 -118.85.118.22/31 118.89.0.0/21 118.89.210.0/23 118.89.212.0/22 diff --git a/data/country/CN/CN-ZJ.txt b/data/country/CN/CN-ZJ.txt index 23c36520..b6245c82 100644 --- a/data/country/CN/CN-ZJ.txt +++ b/data/country/CN/CN-ZJ.txt @@ -435,10 +435,6 @@ 118.84.191.132/30 118.84.191.136/30 118.84.194.32/29 -118.85.117.156/30 -118.85.117.160/31 -118.85.117.164/31 -118.85.117.168/30 118.91.240.0/20 118.178.0.0/16 119.37.192.0/18 diff --git a/data/isp/chinatelecom.txt b/data/isp/chinatelecom.txt index 95f3cc37..36dfeb01 100644 --- a/data/isp/chinatelecom.txt +++ b/data/isp/chinatelecom.txt @@ -1772,10 +1772,7 @@ 183.38.32.0/19 183.38.64.0/18 183.38.128.0/18 -183.38.192.0/21 -183.38.200.0/22 -183.38.204.0/23 -183.38.206.0/24 +183.38.192.0/20 183.39.27.0/24 183.39.152.0/21 183.40.29.0/24 diff --git a/data/isp/chinaunicom.txt b/data/isp/chinaunicom.txt index 6daf4a14..e962b15f 100644 --- a/data/isp/chinaunicom.txt +++ b/data/isp/chinaunicom.txt @@ -3719,16 +3719,14 @@ 221.4.242.0/24 221.4.253.96/27 221.5.3.0/24 -221.5.7.52/30 -221.5.7.72/30 -221.5.8.8/29 -221.5.8.154/31 +221.5.7.0/24 +221.5.8.0/24 221.5.13.0/24 221.5.64.0/24 221.5.66.0/24 -221.5.70.48/31 +221.5.70.0/24 221.5.83.224/27 -221.5.85.54/31 +221.5.85.0/24 221.6.56.0/21 221.6.172.0/22 221.6.176.0/23