diff --git a/gfwlist/gen.py b/gfwlist/gen.py
index cd172b6ad0..81e40a1d3d 100644
--- a/gfwlist/gen.py
+++ b/gfwlist/gen.py
@@ -11,13 +11,7 @@
def main():
china_list_set = IPy.IPSet()
for line in sys.stdin:
- line_params = line.split("|")
- if len(line_params) < 5 or line_params[2] != "ipv4" or line_params[1] != "CN":
- continue
- ip_addr = line_params[3]
- ip_length = float(line_params[4])
- ip_mask = 32 - int(math.ceil(math.log(ip_length, 2)))
- china_list_set.add(IPy.IP("%s/%d" % (ip_addr, ip_mask)))
+ china_list_set.add(IPy.IP(line))
# 添加内网地址
internal_list = IPy.IPSet(map(IPy.IP, [
diff --git a/src/main/res/values/chnroute.xml b/src/main/res/values/chnroute.xml
index fca00bf03b..cc48abc6e8 100644
--- a/src/main/res/values/chnroute.xml
+++ b/src/main/res/values/chnroute.xml
@@ -84,8 +84,10 @@
- 27.106.128.0/18
- 27.106.204.0/22
- 27.109.32.0/19
+ - 27.109.124.0/22
- 27.112.0.0/18
- 27.112.80.0/20
+ - 27.112.112.0/21
- 27.113.128.0/18
- 27.115.0.0/17
- 27.116.44.0/22
@@ -137,6 +139,9 @@
- 39.104.0.0/14
- 39.108.0.0/16
- 39.128.0.0/10
+ - 40.72.0.0/15
+ - 40.125.128.0/17
+ - 40.126.64.0/18
- 42.0.0.0/22
- 42.0.8.0/21
- 42.0.16.0/21
@@ -683,6 +688,7 @@
- 49.120.0.0/14
- 49.128.0.0/24
- 49.128.2.0/23
+ - 49.128.4.0/22
- 49.140.0.0/15
- 49.152.0.0/14
- 49.208.0.0/14
@@ -691,6 +697,7 @@
- 49.239.0.0/18
- 49.239.192.0/18
- 49.246.224.0/19
+ - 52.80.0.0/14
- 54.222.0.0/15
- 58.14.0.0/15
- 58.16.0.0/13
@@ -718,6 +725,18 @@
- 59.108.0.0/14
- 59.151.0.0/17
- 59.153.4.0/22
+ - 59.153.32.0/22
+ - 59.153.60.0/22
+ - 59.153.64.0/21
+ - 59.153.72.0/22
+ - 59.153.92.0/22
+ - 59.153.116.0/22
+ - 59.153.136.0/22
+ - 59.153.152.0/21
+ - 59.153.164.0/22
+ - 59.153.168.0/21
+ - 59.153.176.0/20
+ - 59.153.192.0/22
- 59.155.0.0/16
- 59.172.0.0/14
- 59.191.0.0/17
@@ -751,6 +770,7 @@
- 61.232.0.0/14
- 61.236.0.0/15
- 61.240.0.0/14
+ - 91.234.36.0/24
- 100.64.0.0/10
- 101.0.0.0/22
- 101.1.0.0/22
@@ -759,6 +779,7 @@
- 101.16.0.0/12
- 101.32.0.0/12
- 101.48.0.0/15
+ - 101.50.8.0/21
- 101.50.56.0/22
- 101.52.0.0/16
- 101.53.100.0/22
@@ -845,25 +866,35 @@
- 103.4.56.0/22
- 103.4.168.0/22
- 103.4.184.0/22
+ - 103.4.224.0/22
- 103.5.36.0/22
- 103.5.52.0/22
- 103.5.56.0/22
+ - 103.5.152.0/22
+ - 103.5.168.0/22
+ - 103.5.192.0/22
- 103.5.252.0/22
- 103.6.76.0/22
+ - 103.6.108.0/22
- 103.6.220.0/22
+ - 103.6.228.0/22
- 103.7.4.0/22
- 103.7.28.0/22
+ - 103.7.140.0/22
- 103.7.212.0/22
- 103.7.216.0/21
- 103.8.4.0/22
- 103.8.8.0/22
- 103.8.32.0/22
- 103.8.52.0/22
+ - 103.8.68.0/22
- 103.8.108.0/22
- 103.8.156.0/22
- 103.8.200.0/21
- 103.8.220.0/22
- 103.9.8.0/22
+ - 103.9.24.0/22
+ - 103.9.108.0/22
- 103.9.152.0/22
- 103.9.248.0/21
- 103.10.0.0/22
@@ -871,17 +902,23 @@
- 103.10.84.0/22
- 103.10.111.0/24
- 103.10.140.0/22
+ - 103.11.168.0/22
- 103.11.180.0/22
- 103.12.32.0/22
- 103.12.68.0/22
+ - 103.12.92.0/22
- 103.12.136.0/22
- 103.12.184.0/22
- 103.12.232.0/22
+ - 103.13.12.0/22
+ - 103.13.72.0/23
- 103.13.124.0/22
- 103.13.144.0/22
- 103.13.196.0/22
+ - 103.13.220.0/22
- 103.13.244.0/22
- 103.14.84.0/22
+ - 103.14.100.0/22
- 103.14.112.0/22
- 103.14.132.0/22
- 103.14.136.0/22
@@ -899,12 +936,14 @@
- 103.16.124.0/22
- 103.17.40.0/22
- 103.17.120.0/22
+ - 103.17.136.0/22
- 103.17.160.0/22
- 103.17.204.0/22
- 103.17.228.0/22
- 103.18.192.0/22
- 103.18.208.0/21
- 103.18.224.0/22
+ - 103.19.0.0/22
- 103.19.12.0/22
- 103.19.40.0/21
- 103.19.64.0/21
@@ -912,6 +951,7 @@
- 103.19.232.0/22
- 103.20.12.0/22
- 103.20.32.0/22
+ - 103.20.44.0/22
- 103.20.112.0/22
- 103.20.128.0/22
- 103.20.160.0/22
@@ -954,6 +994,8 @@
- 103.25.216.0/22
- 103.26.0.0/22
- 103.26.64.0/22
+ - 103.26.116.0/22
+ - 103.26.132.0/22
- 103.26.156.0/22
- 103.26.160.0/22
- 103.26.228.0/22
@@ -968,6 +1010,7 @@
- 103.28.4.0/22
- 103.28.8.0/22
- 103.28.204.0/22
+ - 103.28.212.0/22
- 103.29.16.0/22
- 103.29.128.0/21
- 103.29.136.0/22
@@ -984,6 +1027,7 @@
- 103.31.160.0/22
- 103.31.168.0/22
- 103.31.200.0/22
+ - 103.31.236.0/22
- 103.32.0.0/15
- 103.34.0.0/16
- 103.35.0.0/19
@@ -1332,6 +1376,49 @@
- 103.196.204.0/22
- 103.197.180.0/22
- 103.197.228.0/22
+ - 103.197.252.0/22
+ - 103.198.20.0/22
+ - 103.198.60.0/22
+ - 103.198.64.0/22
+ - 103.198.72.0/22
+ - 103.198.124.0/22
+ - 103.198.156.0/22
+ - 103.198.180.0/22
+ - 103.198.196.0/22
+ - 103.198.200.0/22
+ - 103.198.216.0/21
+ - 103.198.224.0/20
+ - 103.198.240.0/21
+ - 103.199.164.0/22
+ - 103.199.196.0/22
+ - 103.199.228.0/22
+ - 103.199.248.0/21
+ - 103.200.28.0/22
+ - 103.200.32.0/22
+ - 103.200.52.0/22
+ - 103.200.64.0/21
+ - 103.200.136.0/21
+ - 103.200.144.0/20
+ - 103.200.160.0/19
+ - 103.200.192.0/22
+ - 103.200.220.0/22
+ - 103.200.224.0/19
+ - 103.201.0.0/20
+ - 103.201.16.0/21
+ - 103.201.28.0/22
+ - 103.201.32.0/19
+ - 103.201.64.0/22
+ - 103.201.76.0/22
+ - 103.201.80.0/20
+ - 103.201.96.0/20
+ - 103.201.112.0/21
+ - 103.201.120.0/22
+ - 103.201.152.0/21
+ - 103.201.160.0/19
+ - 103.201.192.0/18
+ - 103.202.0.0/19
+ - 103.202.32.0/20
+ - 103.224.16.0/22
- 103.224.40.0/21
- 103.224.60.0/22
- 103.224.80.0/22
@@ -1496,6 +1583,7 @@
- 103.244.60.0/22
- 103.244.64.0/20
- 103.244.80.0/21
+ - 103.244.116.0/22
- 103.244.164.0/22
- 103.244.232.0/22
- 103.244.252.0/22
@@ -1521,9 +1609,11 @@
- 103.248.168.0/22
- 103.248.192.0/22
- 103.248.212.0/22
+ - 103.248.220.0/22
- 103.248.224.0/21
- - 103.249.12.0/22
+ - 103.249.8.0/21
- 103.249.52.0/22
+ - 103.249.104.0/22
- 103.249.128.0/22
- 103.249.136.0/22
- 103.249.144.0/22
@@ -1549,6 +1639,7 @@
- 103.251.124.0/22
- 103.251.128.0/22
- 103.251.160.0/22
+ - 103.251.192.0/22
- 103.251.204.0/22
- 103.251.236.0/22
- 103.251.240.0/22
@@ -1606,6 +1697,7 @@
- 106.224.0.0/12
- 110.6.0.0/15
- 110.16.0.0/14
+ - 110.34.40.0/21
- 110.40.0.0/14
- 110.44.144.0/20
- 110.48.0.0/16
@@ -1616,12 +1708,14 @@
- 110.72.0.0/15
- 110.75.0.0/16
- 110.76.0.0/18
+ - 110.76.132.0/22
- 110.76.156.0/22
- 110.76.184.0/22
- 110.76.192.0/18
- 110.77.0.0/17
- 110.80.0.0/13
- 110.88.0.0/14
+ - 110.92.68.0/22
- 110.93.32.0/19
- 110.94.0.0/15
- 110.96.0.0/11
@@ -1647,6 +1741,7 @@
- 111.72.0.0/13
- 111.85.0.0/16
- 111.91.192.0/19
+ - 111.92.248.0/21
- 111.112.0.0/14
- 111.116.0.0/15
- 111.118.200.0/21
@@ -1695,11 +1790,13 @@
- 113.12.0.0/14
- 113.16.0.0/15
- 113.18.0.0/16
+ - 113.21.232.0/21
- 113.24.0.0/14
- 113.31.0.0/16
- 113.44.0.0/14
- 113.48.0.0/14
- 113.52.160.0/19
+ - 113.52.228.0/22
- 113.54.0.0/15
- 113.56.0.0/15
- 113.58.0.0/16
@@ -1731,6 +1828,7 @@
- 113.240.0.0/13
- 113.248.0.0/14
- 114.28.0.0/16
+ - 114.31.64.0/21
- 114.54.0.0/15
- 114.60.0.0/14
- 114.64.0.0/14
@@ -1748,6 +1846,7 @@
- 114.135.0.0/16
- 114.138.0.0/15
- 114.141.64.0/21
+ - 114.141.80.0/21
- 114.141.128.0/18
- 114.196.0.0/15
- 114.198.248.0/21
@@ -1789,6 +1888,8 @@
- 116.58.208.0/20
- 116.60.0.0/14
- 116.66.0.0/17
+ - 116.68.136.0/21
+ - 116.68.176.0/21
- 116.69.0.0/16
- 116.70.0.0/17
- 116.76.0.0/14
@@ -1803,9 +1904,12 @@
- 116.192.0.0/16
- 116.193.16.0/20
- 116.193.32.0/19
+ - 116.193.152.0/22
+ - 116.193.164.0/22
- 116.193.176.0/21
- 116.194.0.0/15
- 116.196.0.0/16
+ - 116.197.160.0/21
- 116.198.0.0/16
- 116.199.0.0/17
- 116.199.128.0/19
@@ -1826,6 +1930,7 @@
- 116.248.0.0/15
- 116.251.64.0/18
- 116.252.0.0/15
+ - 116.254.104.0/21
- 116.254.128.0/17
- 116.255.128.0/17
- 117.8.0.0/13
@@ -1954,6 +2059,7 @@
- 119.148.160.0/19
- 119.151.192.0/18
- 119.160.200.0/21
+ - 119.161.120.0/21
- 119.161.128.0/17
- 119.162.0.0/15
- 119.164.0.0/14
@@ -1981,6 +2087,7 @@
- 120.92.0.0/16
- 120.94.0.0/15
- 120.128.0.0/13
+ - 120.136.16.0/21
- 120.136.128.0/18
- 120.137.0.0/17
- 120.143.128.0/19
@@ -2041,6 +2148,7 @@
- 122.102.64.0/19
- 122.112.0.0/14
- 122.119.0.0/16
+ - 122.128.100.0/22
- 122.128.120.0/21
- 122.136.0.0/13
- 122.144.128.0/17
@@ -2049,6 +2157,7 @@
- 122.188.0.0/14
- 122.192.0.0/14
- 122.198.0.0/16
+ - 122.200.40.0/21
- 122.200.64.0/18
- 122.201.48.0/20
- 122.204.0.0/14
@@ -2093,9 +2202,11 @@
- 123.206.0.0/15
- 123.232.0.0/14
- 123.242.0.0/17
+ - 123.242.192.0/21
- 123.244.0.0/14
- 123.249.0.0/16
- 123.253.0.0/16
+ - 123.254.96.0/21
- 124.6.64.0/18
- 124.14.0.0/15
- 124.16.0.0/15
@@ -2106,6 +2217,7 @@
- 124.40.112.0/20
- 124.40.128.0/18
- 124.40.192.0/19
+ - 124.40.240.0/22
- 124.42.0.0/16
- 124.47.0.0/18
- 124.64.0.0/15
@@ -2159,6 +2271,7 @@
- 125.216.0.0/13
- 125.254.128.0/17
- 127.0.0.0/8
+ - 137.59.88.0/22
- 139.9.0.0/16
- 139.129.0.0/16
- 139.148.0.0/16
@@ -2294,10 +2407,13 @@
- 175.64.0.0/11
- 175.102.0.0/16
- 175.106.128.0/17
+ - 175.111.108.0/22
- 175.146.0.0/15
- 175.148.0.0/14
- 175.152.0.0/14
+ - 175.158.96.0/22
- 175.160.0.0/12
+ - 175.176.156.0/22
- 175.178.0.0/16
- 175.184.128.0/18
- 175.185.0.0/16
@@ -2309,6 +2425,7 @@
- 180.88.0.0/14
- 180.94.56.0/21
- 180.94.96.0/20
+ - 180.94.120.0/21
- 180.95.128.0/17
- 180.96.0.0/11
- 180.129.128.0/17
@@ -2322,6 +2439,7 @@
- 180.150.160.0/19
- 180.152.0.0/13
- 180.160.0.0/12
+ - 180.178.112.0/21
- 180.178.192.0/18
- 180.184.0.0/14
- 180.188.0.0/17
@@ -2330,13 +2448,17 @@
- 180.201.0.0/16
- 180.202.0.0/15
- 180.208.0.0/15
+ - 180.210.212.0/22
- 180.210.224.0/19
- 180.212.0.0/15
- 180.222.224.0/19
- 180.223.0.0/16
- 180.233.0.0/18
- 180.233.64.0/19
+ - 180.233.144.0/22
- 180.235.64.0/19
+ - 180.235.136.0/22
+ - 182.16.144.0/21
- 182.16.192.0/19
- 182.18.0.0/17
- 182.23.184.0/21
@@ -2348,6 +2470,7 @@
- 182.50.112.0/20
- 182.51.0.0/16
- 182.54.0.0/17
+ - 182.54.244.0/22
- 182.61.0.0/16
- 182.80.0.0/13
- 182.88.0.0/14
@@ -2360,13 +2483,16 @@
- 182.174.0.0/15
- 182.200.0.0/13
- 182.236.128.0/17
+ - 182.237.24.0/21
- 182.238.0.0/16
- 182.239.0.0/19
- 182.240.0.0/13
- 182.254.0.0/16
- 183.0.0.0/10
- 183.64.0.0/13
+ - 183.78.160.0/21
- 183.78.180.0/22
+ - 183.81.172.0/22
- 183.81.180.0/22
- 183.84.0.0/15
- 183.91.128.0/22
@@ -2395,6 +2521,8 @@
- 202.3.128.0/23
- 202.4.128.0/19
- 202.4.252.0/22
+ - 202.5.208.0/21
+ - 202.5.216.0/22
- 202.6.6.0/23
- 202.6.66.0/23
- 202.6.72.0/23
@@ -2423,6 +2551,7 @@
- 202.9.57.0/24
- 202.9.58.0/23
- 202.10.64.0/20
+ - 202.10.112.0/20
- 202.12.1.0/24
- 202.12.2.0/24
- 202.12.17.0/24
@@ -2458,6 +2587,7 @@
- 202.14.158.0/23
- 202.14.169.0/24
- 202.14.170.0/23
+ - 202.14.172.0/22
- 202.14.176.0/24
- 202.14.184.0/23
- 202.14.208.0/23
@@ -2483,6 +2613,7 @@
- 202.20.120.0/24
- 202.20.125.0/24
- 202.20.127.0/24
+ - 202.21.48.0/20
- 202.21.131.0/24
- 202.21.132.0/24
- 202.21.141.0/24
@@ -2535,10 +2666,13 @@
- 202.41.130.0/23
- 202.41.152.0/21
- 202.41.192.0/24
+ - 202.41.196.0/22
+ - 202.41.200.0/22
- 202.41.240.0/20
- 202.43.76.0/22
- 202.43.144.0/20
- 202.44.16.0/20
+ - 202.44.48.0/22
- 202.44.67.0/24
- 202.44.74.0/24
- 202.44.129.0/24
@@ -2555,11 +2689,17 @@
- 202.46.128.0/24
- 202.46.224.0/20
- 202.47.82.0/23
+ - 202.47.96.0/20
- 202.47.126.0/24
- 202.47.128.0/24
- 202.47.130.0/23
+ - 202.57.192.0/20
+ - 202.57.212.0/22
+ - 202.57.216.0/22
- 202.57.240.0/20
- 202.58.0.0/24
+ - 202.58.104.0/22
+ - 202.58.112.0/22
- 202.59.0.0/24
- 202.59.212.0/22
- 202.59.232.0/23
@@ -2582,17 +2722,22 @@
- 202.63.248.0/22
- 202.65.0.0/21
- 202.65.8.0/23
+ - 202.65.96.0/20
- 202.67.0.0/22
- 202.69.4.0/22
- 202.69.16.0/20
- 202.70.0.0/19
- 202.70.96.0/20
- 202.70.192.0/20
+ - 202.71.32.0/20
- 202.72.40.0/21
- 202.72.80.0/20
+ - 202.72.112.0/20
- 202.73.128.0/22
+ - 202.73.240.0/20
- 202.74.8.0/21
- 202.74.80.0/20
+ - 202.74.232.0/22
- 202.74.254.0/23
- 202.75.208.0/20
- 202.75.252.0/22
@@ -2604,6 +2749,7 @@
- 202.79.248.0/22
- 202.80.192.0/20
- 202.81.0.0/22
+ - 202.81.176.0/20
- 202.83.252.0/22
- 202.84.0.0/20
- 202.84.16.0/23
@@ -2612,7 +2758,10 @@
- 202.86.249.0/24
- 202.86.252.0/22
- 202.87.80.0/20
+ - 202.88.32.0/22
- 202.89.8.0/21
+ - 202.89.96.0/22
+ - 202.89.108.0/22
- 202.89.232.0/21
- 202.90.0.0/22
- 202.90.112.0/20
@@ -2673,7 +2822,9 @@
- 202.136.48.0/20
- 202.136.208.0/20
- 202.136.224.0/20
+ - 202.136.248.0/22
- 202.137.231.0/24
+ - 202.140.140.0/22
- 202.141.160.0/19
- 202.142.16.0/20
- 202.143.4.0/22
@@ -2717,6 +2868,7 @@
- 202.165.251.0/24
- 202.165.252.0/22
- 202.166.224.0/19
+ - 202.168.80.0/22
- 202.168.160.0/19
- 202.170.128.0/19
- 202.170.216.0/21
@@ -2730,6 +2882,7 @@
- 202.173.120.0/22
- 202.173.224.0/19
- 202.174.64.0/20
+ - 202.174.124.0/22
- 202.176.224.0/19
- 202.179.240.0/20
- 202.180.128.0/19
@@ -3553,9 +3706,11 @@
- 203.80.144.0/20
- 203.81.0.0/21
- 203.81.16.0/20
+ - 203.81.244.0/22
- 203.82.0.0/23
- 203.82.16.0/21
- 203.83.0.0/22
+ - 203.83.8.0/21
- 203.83.56.0/21
- 203.83.224.0/20
- 203.86.0.0/17
@@ -3566,7 +3721,7 @@
- 203.89.8.0/21
- 203.89.136.0/22
- 203.90.0.0/22
- - 203.90.8.0/22
+ - 203.90.8.0/21
- 203.90.128.0/18
- 203.90.192.0/19
- 203.91.32.0/19
@@ -3657,6 +3812,8 @@
- 203.189.6.0/23
- 203.189.112.0/22
- 203.189.192.0/19
+ - 203.189.232.0/21
+ - 203.189.240.0/22
- 203.190.96.0/20
- 203.190.249.0/24
- 203.191.0.0/23
@@ -3670,6 +3827,7 @@
- 203.195.112.0/21
- 203.195.128.0/17
- 203.196.0.0/20
+ - 203.196.28.0/22
- 203.202.236.0/22
- 203.205.64.0/19
- 203.205.128.0/17
@@ -3689,6 +3847,7 @@
- 210.5.0.0/19
- 210.5.56.0/21
- 210.5.128.0/19
+ - 210.7.56.0/21
- 210.12.0.0/15
- 210.14.64.0/19
- 210.14.112.0/20
@@ -3797,12 +3956,14 @@
- 223.0.0.0/12
- 223.20.0.0/15
- 223.27.184.0/22
+ - 223.29.252.0/22
- 223.64.0.0/11
- 223.96.0.0/12
- 223.112.0.0/14
- 223.116.0.0/15
- 223.120.0.0/13
- 223.128.0.0/15
+ - 223.130.8.0/22
- 223.144.0.0/12
- 223.160.0.0/14
- 223.166.0.0/15