OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2023-10-23 21:52:05

This commit is contained in:
github-actions[bot] 2023-10-23 21:52:05 +08:00
parent a244cfe4b1
commit 7c0912df8c
29 changed files with 1920 additions and 2478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
homeproxy/root/etc/homeproxy/resources/china_ip4.txt
View File

@ -50,6 +50,7 @@
8.144.0.0/14
8.148.0.0/19
8.244.36.0/24
8.244.68.0/24
14.16.0.0/12
14.102.156.0/22
14.103.0.0/18
@ -60,10 +61,8 @@
14.204.0.0/15
14.208.0.0/12
23.26.98.0/24
23.26.134.0/24
23.26.239.0/24
23.144.232.0/24
23.151.168.0/24
27.0.128.0/24
27.0.130.0/23
27.0.132.0/22
@ -118,6 +117,7 @@
37.128.240.0/21
38.6.227.0/24
38.46.0.0/23
38.46.2.0/24
38.60.34.0/24
38.60.40.0/24
38.60.45.0/24
@ -196,13 +196,10 @@
42.248.0.0/15
43.128.0.0/15
43.130.0.0/16
43.131.0.0/17
43.131.128.0/19
43.131.192.0/18
43.131.0.0/18
43.131.224.0/19
43.132.0.0/18
43.132.68.0/24
43.132.70.0/23
43.132.85.0/24
43.132.96.0/19
43.132.128.0/17
43.133.0.0/16
@ -212,17 +209,24 @@
43.135.192.0/19
43.136.0.0/13
43.144.0.0/15
43.152.64.0/19
43.152.64.0/20
43.152.80.0/21
43.152.90.0/23
43.152.92.0/22
43.152.96.0/20
43.152.112.0/22
43.152.192.0/18
43.153.0.0/16
43.154.0.0/15
43.156.0.0/15
43.158.0.0/16
43.158.0.0/17
43.158.192.0/18
43.159.0.0/18
43.159.128.0/17
43.160.0.0/15
43.160.0.0/17
43.160.128.0/19
43.160.192.0/18
43.161.0.0/16
43.162.0.0/16
43.163.192.0/18
43.172.15.0/24
@ -261,10 +265,9 @@
43.227.68.0/24
43.227.104.0/22
43.227.140.0/22
43.227.152.0/21
43.227.152.0/22
43.227.157.0/24
43.227.176.0/21
43.227.192.0/21
43.227.216.0/21
43.227.252.0/22
43.228.0.0/21
43.228.36.0/22
@ -308,8 +311,7 @@
43.240.200.0/23
43.240.204.0/22
43.241.16.0/22
43.241.48.0/24
43.241.50.0/23
43.241.48.0/22
43.241.76.0/22
43.241.180.0/22
43.241.208.0/20
@ -351,7 +353,7 @@
43.248.112.0/21
43.248.128.0/20
43.248.184.0/21
43.248.200.0/22
43.248.192.0/20
43.248.244.0/22
43.249.96.0/24
43.249.136.0/22
@ -371,6 +373,7 @@
43.251.100.0/22
43.251.244.0/22
43.252.48.0/24
43.252.208.0/24
43.252.210.0/23
43.254.0.0/22
43.254.8.0/22
@ -398,7 +401,8 @@
43.255.68.0/22
43.255.84.0/22
43.255.96.0/22
43.255.116.0/22
43.255.116.0/23
43.255.119.0/24
43.255.192.0/22
43.255.212.0/22
43.255.224.0/21
@ -410,13 +414,16 @@
44.31.113.0/24
44.31.212.0/24
44.31.216.0/24
44.159.64.0/22
44.31.231.0/24
44.159.65.0/24
44.159.73.0/24
45.3.32.0/19
45.9.11.0/24
45.12.82.0/24
45.40.192.0/18
45.65.20.0/22
45.65.24.0/22
45.78.80.0/20
45.82.236.0/22
45.86.73.0/24
45.89.104.0/24
@ -434,7 +441,6 @@
45.115.144.0/22
45.115.164.0/22
45.115.200.0/22
45.115.244.0/22
45.116.32.0/22
45.116.52.0/22
45.116.100.0/22
@ -443,6 +449,7 @@
45.116.208.0/22
45.117.8.0/22
45.119.60.0/22
45.119.64.0/24
45.119.68.0/22
45.119.104.0/22
45.119.116.0/22
@ -471,15 +478,17 @@
45.146.82.0/24
45.146.112.0/23
45.147.6.0/24
45.151.47.0/24
45.157.88.0/24
45.158.11.0/24
45.192.184.0/24
45.195.4.0/24
45.195.6.0/23
45.195.6.0/24
45.197.32.0/19
45.202.8.0/23
45.204.24.0/21
45.207.22.0/23
45.207.24.0/22
45.207.26.0/23
45.207.128.0/19
45.207.176.0/20
45.248.8.0/22
@ -524,6 +533,7 @@
47.112.0.0/13
47.120.0.0/15
47.122.0.0/17
47.122.128.0/18
47.123.0.0/16
47.246.0.0/22
47.246.4.0/24
@ -579,6 +589,7 @@
49.239.192.0/18
50.114.63.0/24
50.114.121.0/24
50.114.243.0/24
52.80.0.0/15
52.82.0.0/17
52.82.128.0/23
@ -588,7 +599,6 @@
52.82.136.0/24
52.82.144.0/23
52.82.148.0/22
52.82.153.0/24
52.82.160.0/21
52.82.168.0/24
52.82.170.0/23
@ -709,18 +719,11 @@
61.128.0.0/10
61.232.0.0/14
61.236.0.0/15
61.240.0.0/17
61.240.128.0/18
61.240.192.0/19
61.240.224.0/20
61.240.240.0/21
61.240.0.0/16
61.241.0.0/17
61.241.128.0/18
61.241.192.0/19
61.242.0.0/16
61.243.0.0/17
61.243.128.0/18
61.243.192.0/19
61.242.0.0/15
62.234.0.0/16
63.140.0.0/24
63.140.3.0/24
@ -730,14 +733,14 @@
63.217.81.0/24
63.217.87.0/24
63.243.252.0/24
65.111.0.0/19
66.102.240.0/21
66.102.248.0/22
66.102.252.0/24
66.102.254.0/23
68.79.0.0/18
69.163.104.0/24
69.163.106.0/23
69.163.108.0/24
69.163.106.0/24
69.172.70.0/24
69.230.192.0/18
69.231.128.0/18
@ -787,6 +790,7 @@
101.37.0.0/16
101.38.0.0/15
101.40.0.0/14
101.49.206.0/23
101.50.8.0/21
101.50.56.0/22
101.52.4.0/24
@ -831,6 +835,7 @@
101.198.0.0/22
101.198.128.0/18
101.198.192.0/19
101.199.48.0/20
101.199.97.0/24
101.199.112.0/23
101.199.114.0/24
@ -864,6 +869,7 @@
101.254.64.0/18
101.254.128.0/17
103.1.10.0/23
103.1.158.0/24
103.1.168.0/22
103.2.108.0/22
103.2.208.0/22
@ -937,8 +943,7 @@
103.27.4.0/22
103.27.24.0/22
103.27.176.0/22
103.27.208.0/24
103.27.210.0/23
103.27.208.0/22
103.27.240.0/22
103.28.8.0/24
103.28.204.0/22
@ -972,8 +977,7 @@
103.37.7.0/24
103.37.12.0/22
103.37.16.0/22
103.37.44.0/23
103.37.46.0/24
103.37.44.0/22
103.37.72.0/22
103.37.100.0/22
103.37.136.0/21
@ -990,6 +994,7 @@
103.39.208.0/20
103.39.224.0/21
103.39.232.0/22
103.40.12.0/22
103.40.192.0/22
103.40.232.0/22
103.40.240.0/20
@ -1001,14 +1006,13 @@
103.41.232.0/23
103.42.8.0/22
103.42.76.0/22
103.43.100.0/23
103.43.132.0/23
103.43.172.0/23
103.43.175.0/24
103.43.184.0/22
103.44.56.0/22
103.44.80.0/22
103.44.144.0/22
103.44.144.0/23
103.44.168.0/22
103.44.176.0/22
103.44.236.0/22
@ -1024,13 +1028,13 @@
103.45.172.0/22
103.45.176.0/20
103.45.248.0/22
103.46.12.0/22
103.46.136.0/22
103.46.168.0/22
103.47.48.0/22
103.47.80.0/22
103.48.171.0/24
103.48.232.0/23
103.49.12.0/22
103.49.61.0/24
103.49.62.0/24
103.49.180.0/22
103.49.196.0/22
@ -1048,7 +1052,6 @@
103.54.48.0/22
103.55.172.0/22
103.55.228.0/22
103.56.20.0/22
103.56.32.0/22
103.56.60.0/22
103.56.76.0/22
@ -1059,6 +1062,7 @@
103.57.12.0/22
103.57.139.0/24
103.59.112.0/22
103.59.118.0/23
103.59.122.0/23
103.59.124.0/22
103.59.148.0/22
@ -1071,7 +1075,7 @@
103.61.153.0/24
103.61.154.0/23
103.61.188.0/22
103.62.55.0/24
103.62.52.0/23
103.63.160.0/20
103.63.176.0/21
103.63.244.0/22
@ -1082,6 +1086,7 @@
103.64.208.0/21
103.65.8.0/22
103.66.32.0/22
103.67.52.0/23
103.68.128.0/22
103.68.168.0/24
103.69.16.0/22
@ -1098,7 +1103,6 @@
103.72.32.0/20
103.72.48.0/21
103.72.112.0/23
103.72.123.0/24
103.72.128.0/21
103.72.172.0/24
103.73.48.0/24
@ -1129,6 +1133,7 @@
103.82.52.0/22
103.82.224.0/22
103.83.44.0/22
103.83.72.0/22
103.83.120.0/22
103.84.110.0/24
103.84.138.0/23
@ -1138,6 +1143,7 @@
103.85.168.0/21
103.85.176.0/22
103.85.224.0/22
103.87.180.0/22
103.88.32.0/21
103.88.64.0/22
103.89.184.0/21
@ -1179,6 +1185,8 @@
103.100.64.0/22
103.101.124.0/23
103.101.180.0/22
103.102.4.0/23
103.102.7.0/24
103.102.192.0/21
103.102.200.0/22
103.103.12.0/24
@ -1205,7 +1213,7 @@
103.114.236.0/22
103.115.120.0/22
103.115.248.0/22
103.116.74.0/23
103.116.75.0/24
103.116.76.0/22
103.116.92.0/22
103.116.120.0/23
@ -1221,6 +1229,7 @@
103.119.104.0/22
103.119.224.0/22
103.120.72.0/22
103.120.196.0/22
103.120.224.0/22
103.121.52.0/22
103.121.92.0/22
@ -1242,7 +1251,6 @@
103.131.152.0/22
103.131.168.0/22
103.131.178.0/23
103.132.80.0/23
103.132.212.0/23
103.132.234.0/23
103.133.176.0/22
@ -1264,8 +1272,6 @@
103.141.10.0/23
103.142.96.0/23
103.142.154.0/23
103.142.172.0/23
103.142.190.0/23
103.142.220.0/23
103.142.234.0/23
103.143.16.0/22
@ -1286,10 +1292,12 @@
103.149.181.0/24
103.149.242.0/24
103.149.244.0/22
103.150.10.0/23
103.150.24.0/23
103.150.164.0/23
103.150.181.0/24
103.150.212.0/24
103.151.142.0/23
103.151.148.0/22
103.151.178.0/23
103.151.216.0/23
@ -1311,7 +1319,9 @@
103.156.68.0/23
103.156.174.0/23
103.156.186.0/23
103.157.138.0/23
103.158.0.0/23
103.158.74.0/24
103.159.124.0/23
103.161.220.0/23
103.161.254.0/23
@ -1333,7 +1343,6 @@
103.177.44.0/24
103.179.78.0/23
103.180.108.0/24
103.181.164.0/23
103.181.234.0/24
103.183.66.0/23
103.183.218.0/23
@ -1436,7 +1445,6 @@
103.222.33.0/24
103.222.40.0/22
103.222.176.0/21
103.222.188.0/22
103.222.216.0/22
103.223.132.0/22
103.224.220.0/22
@ -1473,7 +1481,6 @@
103.233.128.0/22
103.233.136.0/23
103.233.138.0/24
103.233.178.0/24
103.234.20.0/22
103.234.54.0/24
103.234.56.0/22
@ -1488,11 +1495,10 @@
103.235.220.0/22
103.235.224.0/19
103.236.120.0/22
103.236.224.0/23
103.236.224.0/24
103.236.240.0/20
103.237.8.0/22
103.237.28.0/23
103.237.101.0/24
103.237.103.0/24
103.237.248.0/21
103.238.0.0/21
@ -1580,10 +1586,12 @@
103.255.88.0/21
103.255.140.0/22
103.255.200.0/22
104.167.16.0/20
104.192.108.0/23
104.192.110.0/24
104.193.88.0/23
104.193.90.0/24
104.207.32.0/19
106.0.4.0/22
106.2.16.0/20
106.2.32.0/19
@ -1633,7 +1641,6 @@
106.224.0.0/14
106.228.0.0/15
106.230.0.0/16
107.151.251.0/24
108.165.168.0/24
109.244.0.0/16
110.6.0.0/15
@ -1648,6 +1655,7 @@
110.41.0.0/16
110.42.0.0/15
110.44.12.0/22
110.44.144.0/20
110.51.0.0/16
110.52.0.0/15
110.56.0.0/13
@ -1661,7 +1669,23 @@
110.77.0.0/17
110.80.0.0/13
110.88.0.0/14
110.96.0.0/11
110.96.0.0/14
110.100.0.0/15
110.103.0.0/19
110.103.32.0/20
110.104.0.0/17
110.104.128.0/19
110.105.0.0/16
110.106.0.0/15
110.110.0.0/15
110.112.0.0/15
110.114.0.0/16
110.115.128.0/17
110.116.0.0/16
110.118.0.0/16
110.120.0.0/14
110.124.0.0/15
110.126.0.0/16
110.152.0.0/14
110.156.0.0/15
110.166.0.0/15
@ -1749,6 +1773,7 @@
113.31.144.0/20
113.31.160.0/19
113.31.192.0/18
113.48.48.0/20
113.50.0.0/20
113.50.32.0/24
113.50.48.0/20
@ -1829,6 +1854,7 @@
114.113.221.0/24
114.113.223.0/24
114.113.224.0/20
114.114.112.0/21
114.115.0.0/16
114.116.0.0/15
114.118.0.0/17
@ -1875,7 +1901,6 @@
116.16.0.0/12
116.52.0.0/14
116.56.0.0/15
116.58.208.0/20
116.62.0.0/15
116.66.36.0/24
116.66.48.0/21
@ -1954,6 +1979,7 @@
116.248.0.0/15
116.252.0.0/15
116.254.104.0/21
116.254.192.0/18
116.255.128.0/17
117.8.0.0/13
117.21.0.0/16
@ -2113,8 +2139,7 @@
118.193.173.0/24
118.194.32.0/19
118.194.128.0/21
118.194.160.0/21
118.194.172.0/22
118.194.164.0/22
118.194.240.0/21
118.195.0.0/16
118.199.0.0/16
@ -2235,7 +2260,8 @@
119.164.0.0/14
119.176.0.0/12
119.233.128.0/17
119.235.128.0/22
119.235.128.0/24
119.235.130.0/24
119.235.136.0/24
119.235.138.0/24
119.235.143.0/24
@ -2297,7 +2323,7 @@
120.132.0.0/18
120.132.64.0/19
120.132.96.0/20
120.132.112.0/23
120.132.112.0/24
120.132.116.0/22
120.132.120.0/21
120.132.128.0/17
@ -2429,7 +2455,7 @@
123.52.0.0/14
123.56.0.0/15
123.58.0.0/18
123.58.64.0/23
123.58.64.0/24
123.58.96.0/19
123.58.160.0/19
123.58.224.0/19
@ -2437,10 +2463,6 @@
123.60.0.0/15
123.64.0.0/12
123.80.0.0/13
123.88.140.0/22
123.88.180.0/22
123.88.184.0/21
123.89.148.0/22
123.90.0.0/15
123.92.0.0/14
123.96.0.0/15
@ -2483,7 +2505,9 @@
124.14.8.0/22
124.14.12.0/23
124.14.15.0/24
124.14.16.0/21
124.14.16.0/23
124.14.18.0/24
124.14.20.0/22
124.14.64.0/18
124.14.224.0/19
124.16.0.0/15
@ -2603,7 +2627,6 @@
132.232.0.0/16
132.237.134.0/24
134.175.0.0/16
134.195.121.0/24
136.0.92.0/24
139.5.60.0/22
139.9.0.0/18
@ -2643,7 +2666,6 @@
139.224.0.0/16
139.226.0.0/15
140.75.0.0/16
140.99.185.0/24
140.143.0.0/16
140.179.0.0/16
140.205.0.0/16
@ -2700,10 +2722,12 @@
146.222.94.0/24
147.78.132.0/22
148.70.0.0/16
149.115.122.0/23
149.115.124.0/24
149.127.218.0/24
150.107.0.0/23
150.109.0.0/16
150.129.40.0/24
150.129.136.0/22
150.129.192.0/22
150.129.252.0/22
@ -2734,10 +2758,11 @@
153.118.0.0/15
153.254.119.0/24
154.8.128.0/17
154.19.37.0/24
154.39.71.0/24
154.48.252.0/24
154.72.40.0/21
154.72.40.0/22
154.72.44.0/24
154.72.47.0/24
154.83.28.0/24
154.85.32.0/21
154.85.40.0/22
@ -2745,8 +2770,7 @@
154.85.48.0/20
154.91.32.0/23
154.91.34.0/24
154.194.2.0/23
154.194.64.0/24
154.195.4.0/24
154.196.4.0/22
154.196.8.0/21
154.197.56.0/21
@ -2788,10 +2812,11 @@
156.240.88.0/22
156.240.112.0/20
156.241.8.0/21
156.242.4.0/23
156.242.5.0/24
156.242.6.0/24
156.242.8.0/24
156.247.16.0/20
156.253.32.0/20
156.254.32.0/19
156.254.64.0/19
156.254.96.0/20
@ -2821,9 +2846,20 @@
161.189.0.0/16
161.207.0.0/16
162.14.0.0/16
162.62.0.0/17
162.62.128.0/18
162.62.192.0/19
162.62.10.0/23
162.62.14.0/23
162.62.42.0/23
162.62.48.0/20
162.62.64.0/20
162.62.80.0/21
162.62.96.0/19
162.62.128.0/23
162.62.132.0/22
162.62.136.0/21
162.62.144.0/20
162.62.160.0/21
162.62.168.0/22
162.62.208.0/20
162.62.224.0/20
162.105.0.0/16
163.0.0.0/16
@ -2886,12 +2922,12 @@
163.181.132.0/23
163.181.135.0/24
163.181.136.0/22
163.181.140.0/24
163.181.140.0/23
163.181.144.0/22
163.181.148.0/23
163.181.153.0/24
163.181.160.0/24
163.181.163.0/24
163.181.162.0/23
163.204.0.0/16
163.228.0.0/16
163.244.246.0/24
@ -2910,7 +2946,6 @@
168.160.168.0/24
168.160.224.0/19
170.106.0.0/16
170.225.224.0/23
171.8.0.0/13
171.34.0.0/15
171.36.0.0/14
@ -2951,7 +2986,6 @@
175.188.188.0/22
175.190.24.0/21
175.190.126.0/23
176.105.231.0/24
176.126.105.0/24
180.76.0.0/14
180.84.0.0/15
@ -3058,6 +3092,7 @@
185.75.172.0/23
185.75.174.0/24
185.216.248.0/22
185.225.1.0/24
185.229.222.0/24
185.234.214.0/23
185.255.152.0/23
@ -3081,7 +3116,6 @@
194.127.229.0/24
194.138.202.0/23
194.138.245.0/24
195.180.157.0/24
195.242.242.0/24
198.8.58.0/23
198.175.100.0/22
@ -3351,7 +3385,6 @@
203.79.0.0/20
203.80.57.0/24
203.80.144.0/20
203.81.16.0/20
203.82.0.0/23
203.83.56.0/21
203.86.0.0/18
@ -3394,6 +3427,7 @@
203.107.6.0/24
203.107.13.0/24
203.107.20.0/22
203.107.24.0/24
203.107.26.0/23
203.107.28.0/22
203.107.32.0/19
@ -3448,7 +3482,10 @@
203.166.186.0/23
203.166.188.0/23
203.166.191.0/24
203.168.0.0/19
203.168.0.0/23
203.168.2.0/24
203.168.16.0/23
203.168.18.0/24
203.168.229.0/24
203.170.58.0/23
203.174.4.0/24
@ -3471,7 +3508,9 @@
203.192.16.0/24
203.192.24.0/23
203.193.224.0/19
203.194.120.0/21
203.194.120.0/22
203.194.124.0/24
203.194.126.0/23
203.195.64.0/19
203.195.112.0/21
203.195.128.0/17
@ -3483,7 +3522,8 @@
203.205.136.0/21
203.205.144.0/22
203.205.155.0/24
203.205.156.0/22
203.205.156.0/23
203.205.159.0/24
203.205.188.0/24
203.205.191.0/24
203.205.192.0/21
@ -3504,6 +3544,7 @@
203.207.208.0/20
203.207.224.0/19
203.208.32.0/19
203.208.184.0/24
203.209.224.0/19
203.212.0.0/20
203.212.80.0/23
@ -3513,7 +3554,6 @@
203.223.21.0/24
203.223.23.0/24
204.14.76.0/24
204.114.176.0/23
206.161.216.0/23
206.161.218.0/24
207.226.136.0/23
@ -3654,11 +3694,7 @@
211.99.28.0/23
211.99.30.0/24
211.99.32.0/19
211.99.64.0/19
211.99.96.0/20
211.99.112.0/21
211.99.120.0/23
211.99.122.0/24
211.99.64.0/18
211.99.128.0/17
211.100.0.0/17
211.100.192.0/20
@ -3671,7 +3707,6 @@
211.102.128.0/18
211.102.192.0/23
211.102.208.0/20
211.102.240.0/20
211.103.0.0/16
211.136.0.0/13
211.144.9.0/24
@ -3816,6 +3851,7 @@
212.64.0.0/17
212.129.128.0/17
216.228.126.0/24
217.114.35.0/24
218.0.0.0/11
218.56.0.0/13
218.64.0.0/11
@ -4006,9 +4042,10 @@
221.129.248.0/23
221.129.252.0/24
221.130.0.0/15
221.133.224.0/21
221.133.225.0/24
221.133.226.0/23
221.133.228.0/22
221.133.232.0/22
221.133.238.0/24
221.133.240.0/20
221.137.0.0/16
221.172.0.0/14
@ -4027,23 +4064,23 @@
222.32.0.0/11
222.64.0.0/11
222.125.0.0/16
222.126.128.0/21
222.126.136.0/22
222.126.128.0/22
222.126.132.0/23
222.126.140.0/23
222.126.144.0/20
222.126.160.0/21
222.126.168.0/22
222.126.172.0/23
222.126.174.0/24
222.126.176.0/20
222.126.192.0/21
222.126.204.0/22
222.126.208.0/22
222.126.176.0/21
222.126.192.0/22
222.126.196.0/23
222.126.208.0/23
222.126.212.0/23
222.126.216.0/22
222.126.220.0/24
222.126.222.0/23
222.126.224.0/19
222.126.216.0/23
222.126.228.0/23
222.126.236.0/22
222.126.240.0/20
222.128.0.0/12
222.160.0.0/14
222.168.0.0/13
@ -4051,7 +4088,16 @@
222.192.0.0/11
222.240.0.0/13
222.248.0.0/15
223.0.0.0/16
223.0.1.0/24
223.0.2.0/24
223.0.8.0/23
223.0.10.0/24
223.0.12.0/23
223.0.15.0/24
223.0.16.0/24
223.0.20.0/24
223.0.30.0/24
223.0.126.0/24
223.2.0.0/15
223.4.0.0/14
223.8.0.0/13

2
homeproxy/root/etc/homeproxy/resources/china_ip4.ver
View File

@ -1 +1 @@
20230923150004
20231023150003

215
homeproxy/root/etc/homeproxy/resources/china_ip6.txt
View File

@ -24,7 +24,6 @@
2001:df3:b380::/48
2001:df5:7800::/48
2001:df7:1480::/48
2001:ca48::/32
2400:1160::/32
2400:3200::/32
2400:3f60:3::/48
@ -32,7 +31,6 @@
2400:5400:10::/48
2400:58a0:1400::/48
2400:58a0:1402::/48
2400:5a60::/48
2400:6460::/40
2400:6600::/32
2400:70e0:bed::/48
@ -70,7 +68,7 @@
2400:9380:8201::/48
2400:9380:8221::/48
2400:9380:8301::/48
2400:9380:9000::/47
2400:9380:9001::/48
2400:9380:9002::/48
2400:9380:9005::/48
2400:9380:9009::/48
@ -120,7 +118,6 @@
2401:1160::/32
2401:1320::/32
2401:13a0:1::/48
2401:13a0:2::/48
2401:1740:2000::/48
2401:1d40::/32
2401:2e00::/32
@ -196,7 +193,6 @@
2402:db40::/33
2402:dfc0::/44
2402:dfc0:50::/44
2402:e380:15::/48
2402:e380:100::/40
2402:e480::/32
2402:e740::/32
@ -205,6 +201,7 @@
2402:f000::/32
2402:f8c0::/47
2403:600:a604::/46
2403:600:a608::/48
2403:600:b001::/48
2403:c80::/32
2403:1b80::/48
@ -301,6 +298,7 @@
2404:7240::/33
2404:7600::/32
2404:7940::/32
2404:7ac0:607::/48
2404:8d02:28c8::/48
2404:8d02:4881::/48
2404:c2c0::/40
@ -314,7 +312,6 @@
2404:c300::/32
2404:c940::/48
2404:d7c0:2::/48
2404:de80:400::/40
2404:e280::/47
2404:e5c0::/32
2404:e8c0::/32
@ -344,9 +341,7 @@
2405:6940::/48
2405:6f00:c602::/48
2405:7040:6000::/47
2405:78c0:6e0e::/48
2405:78c0:6e1e::/48
2405:84c0:fdfc::/46
2405:78c0:6e00::/43
2405:8a40::/32
2405:a900::/32
2405:ad00::/32
@ -363,17 +358,19 @@
2406:840:20::/48
2406:840:44::/47
2406:840:78::/48
2406:840:80::/47
2406:840:90::/48
2406:840:100::/47
2406:840:111::/48
2406:840:1c0::/48
2406:840:301::/48
2406:840:380::/48
2406:840:3c0::/48
2406:840:410::/48
2406:840:800::/42
2406:840:840::/47
2406:840:860::/48
2406:840:880::/48
2406:840:950::/48
2406:840:a00::/47
2406:840:a10::/48
2406:840:c00::/47
@ -397,16 +394,17 @@
2406:840:9100::/47
2406:840:9102::/48
2406:840:9200::/40
2406:840:9300::/47
2406:840:95a1::/48
2406:840:9300::/48
2406:840:9680::/44
2406:840:9700::/40
2406:840:9801::/48
2406:840:9810::/48
2406:840:9814::/46
2406:840:981c::/46
2406:840:9900::/44
2406:840:9960::/44
2406:840:9980::/48
2406:840:9998::/47
2406:840:9ef0::/44
2406:840:c0a8::/48
2406:840:e010::/47
@ -417,12 +415,15 @@
2406:840:e03f::/48
2406:840:e080::/44
2406:840:e0cf::/48
2406:840:e0e0::/44
2406:840:e10f::/48
2406:840:e140::/47
2406:840:e14f::/48
2406:840:e180::/44
2406:840:e20f::/48
2406:840:e300::/44
2406:840:e280::/47
2406:840:e300::/48
2406:840:e302::/48
2406:840:e340::/44
2406:840:e360::/48
2406:840:e36f::/48
@ -432,26 +433,28 @@
2406:840:e574::/48
2406:840:e576::/48
2406:840:e57b::/48
2406:840:e57c::/48
2406:840:e57f::/48
2406:840:e666::/47
2406:840:e720::/48
2406:840:e770::/48
2406:840:e777::/48
2406:840:e80f::/48
2406:840:e840::/48
2406:840:e842::/48
2406:840:e84a::/47
2406:840:e841::/48
2406:840:e84a::/48
2406:840:e84f::/48
2406:840:eabf::/48
2406:840:eb00::/45
2406:840:eb0b::/48
2406:840:eb80::/42
2406:840:eee4::/47
2406:840:eeee::/48
2406:840:efa0::/44
2406:840:f000::/44
2406:840:f0a1::/48
2406:840:f0aa::/48
2406:840:f100::/47
2406:840:f200::/44
2406:840:f230::/44
2406:840:f380::/44
2406:840:f40f::/48
2406:840:f440::/47
@ -468,10 +471,9 @@
2406:840:fd06::/48
2406:840:fd1f::/48
2406:840:fe27::/48
2406:840:fe50::/48
2406:840:fe60::/48
2406:840:fe72::/47
2406:840:fe80::/48
2406:840:fe90::/48
2406:840:fed1::/48
2406:840:fed2::/47
2406:840:fed4::/47
@ -524,7 +526,8 @@
2407:c080::/35
2407:c080:4000::/37
2407:c080:5000::/37
2407:d340:7921::/48
2407:c080:8000::/36
2407:d340:8900::/44
2408:4000::/22
2408:8000::/48
2408:8000:2::/47
@ -1063,6 +1066,7 @@
240d:c000:2000::/35
240d:c000:6000::/36
240d:c010::/47
240d:c010:11::/48
240d:c010:14::/48
240d:c010:16::/48
240d:c010:20::/44
@ -1077,6 +1081,7 @@
240e::/20
2602:2a3::/40
2602:2a4:ff::/48
2602:fa1c:121::/48
2602:faac::/40
2602:fab0:11::/48
2602:fbda:600::/48
@ -1104,7 +1109,6 @@
2602:feda:2f0::/48
2602:feda:3c5::/48
2602:feda:ab2::/48
2602:feda:ae7::/48
2602:feda:af3::/48
2602:feda:b8f::/48
2602:feda:ca1::/48
@ -1162,22 +1166,17 @@
2a05:1085::/32
2a05:1086:f000::/47
2a05:1087::/32
2a05:dfc1:1600::/40
2a05:dfc1:5901::/48
2a05:dfc1:5902::/47
2a05:dfc1:5904::/47
2a05:dfc1:5906::/48
2a05:dfc1:5983::/48
2a05:dfc1:5984::/48
2a05:dfc1:1603::/48
2a05:dfc1:1604::/46
2a05:dfc1:16b0::/45
2a05:dfc1:16ff::/48
2a05:dfc1:5a00::/40
2a05:dfc1:7100::/46
2a05:dfc1:7104::/47
2a05:dfc1:8c00::/46
2a05:dfc1:8c04::/47
2a05:dfc1:8c0f::/48
2a05:dfc1:8c90::/46
2a05:dfc1:8c94::/47
2a05:dfc1:8d00::/47
2a05:dfc1:8c01::/48
2a05:dfc1:8c90::/47
2a05:dfc1:8c96::/47
2a05:dfc1:8c98::/47
2a05:dfc1:8d00::/48
2a05:dfc1:8d02::/48
2a06:1287:300::/40
2a06:a001:a0c4::/48
@ -1188,9 +1187,12 @@
2a06:a005:8da::/48
2a06:a005:91f::/48
2a06:a005:9c0::/48
2a06:a005:d22::/48
2a06:a005:d47::/48
2a06:a005:d48::/48
2a06:a005:f80::/44
2a06:a005:1340::/43
2a06:a005:13b0::/44
2a06:a005:13c0::/43
2a06:a005:13e0::/47
2a06:a005:13e8::/48
2a06:a005:13ea::/47
@ -1199,12 +1201,11 @@
2a06:a005:1700::/44
2a06:a005:1800::/48
2a06:a005:1b60::/44
2a06:a005:1c40::/44
2a06:a005:1ee0::/44
2a06:a005:2040::/44
2a06:a005:2100::/44
2a06:a005:2200::/44
2a06:a005:2510::/48
2a06:a005:28f1::/48
2a06:a005:28f3::/48
2a06:a005:28f4::/48
2a06:a005:2921::/48
@ -1218,42 +1219,57 @@
2a06:a005:29d1::/48
2a06:a005:2a00::/42
2a06:a005:2af0::/44
2a06:de00:de04::/47
2a06:de00:de04::/48
2a06:de00:de0e::/48
2a06:de01:809::/48
2a06:de01:814::/48
2a06:de01:83c::/48
2a06:de01:848::/48
2a06:de01:84d::/48
2a06:de01:850::/48
2a06:de01:85b::/48
2a06:de01:896::/47
2a06:de01:89b::/48
2a06:de01:8c3::/48
2a06:de01:8cd::/48
2a06:de01:8d1::/48
2a06:de01:901::/48
2a06:de01:90e::/48
2a06:de01:92e::/48
2a06:de01:801::/48
2a06:de01:825::/48
2a06:de01:828::/48
2a06:de01:82e::/48
2a06:de01:834::/48
2a06:de01:849::/48
2a06:de01:862::/48
2a06:de01:86e::/48
2a06:de01:898::/48
2a06:de01:8a2::/48
2a06:de01:8b1::/48
2a06:de01:8b7::/48
2a06:de01:8c7::/48
2a06:de01:8d7::/48
2a06:de01:8dc::/48
2a06:de01:8ee::/48
2a06:de01:8fd::/48
2a06:de01:907::/48
2a06:de01:912::/48
2a06:de01:93b::/48
2a06:de01:93c::/47
2a06:de01:946::/48
2a06:de01:95e::/48
2a06:de01:94b::/48
2a06:de01:96e::/48
2a06:de01:973::/48
2a06:de01:989::/48
2a06:de01:9a9::/48
2a06:de01:9b3::/48
2a06:de01:a00::/48
2a06:de01:a2c::/48
2a06:de01:a33::/48
2a06:de01:a55::/48
2a06:de01:a66::/48
2a06:de01:a6c::/48
2a06:de01:ae8::/48
2a06:de01:aeb::/48
2a06:de01:aec::/48
2a06:de01:981::/48
2a06:de01:982::/47
2a06:de01:99f::/48
2a06:de01:a04::/48
2a06:de01:a0a::/48
2a06:de01:a1d::/48
2a06:de01:a3b::/48
2a06:de01:a3e::/48
2a06:de01:a42::/48
2a06:de01:a44::/48
2a06:de01:a51::/48
2a06:de01:a53::/48
2a06:de01:a6a::/48
2a06:de01:a70::/48
2a06:de01:a7f::/48
2a06:de01:ac4::/48
2a06:de01:ace::/48
2a06:de01:ad3::/48
2a06:de01:af5::/48
2a06:de01:afa::/48
2a06:de01:b07::/48
2a06:de01:b13::/48
2a06:de01:b25::/48
2a06:de01:b1e::/48
2a06:de01:b29::/48
2a06:de01:b34::/48
2a06:e881:2509::/48
2a06:e881:5501::/48
2a06:e881:5502::/48
@ -1266,10 +1282,7 @@
2a0a:280:2d00::/46
2a0a:280:2d04::/47
2a0a:2840:20::/43
2a0a:2842:100::/48
2a0a:2842:416::/48
2a0a:2845:aab8::/46
2a0a:2845:d647::/48
2a0a:6040:c00::/40
2a0a:6040:e01::/48
2a0a:6040:e02::/47
@ -1355,14 +1368,17 @@
2a0c:b641:510::/48
2a0c:b641:570::/47
2a0c:b641:730::/44
2a0c:b641:a10::/47
2a0c:b641:a11::/48
2a0c:b641:a13::/48
2a0c:b641:a60::/44
2a0d:2146:8040::/48
2a0d:2406:510::/46
2a0d:2580:ff00::/45
2a0d:2580:ff08::/46
2a0d:2581:fffc::/48
2a0d:2581:fffe::/47
2a0d:2586::/48
2a0d:2586:1000::/48
2a0d:2683:2::/48
2a0d:2687::/32
2a0d:2904::/44
@ -1373,11 +1389,11 @@
2a0e:800:ff40::/42
2a0e:8f02:2182::/47
2a0e:8f02:f006::/48
2a0e:8f02:f055::/48
2a0e:8f02:f058::/48
2a0e:97c0:220::/44
2a0e:97c0:550::/44
2a0e:97c0:5ef::/48
2a0e:97c0:68f::/48
2a0e:97c0:804::/46
2a0e:97c0:83f::/48
2a0e:aa01:1fff::/48
@ -1394,9 +1410,6 @@
2a0e:aa07:e039::/48
2a0e:aa07:e03a::/48
2a0e:aa07:e043::/48
2a0e:aa07:e044::/48
2a0e:aa07:e046::/48
2a0e:aa07:e049::/48
2a0e:aa07:e050::/44
2a0e:aa07:e060::/48
2a0e:aa07:e070::/47
@ -1406,6 +1419,7 @@
2a0e:aa07:e0f7::/48
2a0e:aa07:e120::/44
2a0e:aa07:e141::/48
2a0e:aa07:e142::/47
2a0e:aa07:e150::/44
2a0e:aa07:e200::/44
2a0e:aa07:f000::/48
@ -1413,8 +1427,10 @@
2a0e:aa07:f009::/48
2a0e:aa07:f041::/48
2a0e:aa07:f042::/48
2a0e:aa07:f0e0::/44
2a0e:b107:24::/48
2a0e:aa07:f0d0::/47
2a0e:aa07:f0d2::/48
2a0e:aa07:f0d4::/47
2a0e:aa07:f0d6::/48
2a0e:b107:30::/48
2a0e:b107:32::/47
2a0e:b107:a0::/44
@ -1422,13 +1438,10 @@
2a0e:b107:272::/48
2a0e:b107:4e0::/48
2a0e:b107:710::/48
2a0e:b107:790::/44
2a0e:b107:bd0::/48
2a0e:b107:c10::/48
2a0e:b107:da0::/44
2a0e:b107:dce::/48
2a0e:b107:f4a::/48
2a0e:b107:f4f::/48
2a0e:b107:1476::/47
2a0e:b107:14a0::/44
2a0e:b107:16b0::/44
@ -1439,17 +1452,26 @@
2a0e:b107:1d20::/47
2a0e:b107:1d25::/48
2a0e:b107:1e50::/44
2a0e:b107:21c0::/44
2a0e:b107:2220::/44
2a0e:b107:21c0::/43
2a0e:b107:2210::/44
2a0e:b107:2220::/43
2a0e:b107:2240::/42
2a0e:b107:2290::/44
2a0e:b107:22a0::/43
2a0e:b107:22c0::/42
2a0e:b107:2300::/40
2a0e:b107:2400::/45
2a0e:b107:2410::/44
2a0e:b107:2480::/45
2a0f:5707:ac01::/48
2a0f:5707:fff4::/47
2a0f:5707:fe01::/48
2a0f:5707:fff4::/48
2a0f:7803:fc00::/39
2a0f:7803:ff10::/47
2a0f:7803:ff10::/48
2a0f:7803:ffd1::/48
2a0f:7980::/44
2a0f:85c1:30::/47
2a0f:85c1:100::/47
2a0f:9400:6907::/48
2a0f:9400:7700::/48
2a0f:e401:131::/48
2a0f:e401:133::/48
@ -1469,7 +1491,6 @@
2a10:ccc0:ccc::/48
2a10:ccc0:ccc5::/48
2a10:ccc0:ccc6::/48
2a10:ccc0:ccc8::/48
2a10:ccc0:cccc::/46
2a11:f2c0:ffc4::/48
2a12:3fc2:6600::/48
@ -1477,35 +1498,41 @@
2a12:3fc2:aa10::/44
2a12:3fc2:aa40::/44
2a12:3fc2:ab50::/48
2a12:3fc2:e600::/40
2a12:3fc2:e72e::/48
2a12:3fc2:e800::/46
2a12:3fc2:e810::/44
2a12:3fc7::/48
2a12:3fc7:8000::/48
2a12:dd47:5c00::/40
2a12:f8c0:1000::/39
2a12:f8c0:1000::/40
2a12:f8c0:1200::/40
2a12:f8c1::/48
2a12:f8c3::/36
2a13:1800::/48
2a13:1800:10::/48
2a13:1800:80::/44
2a13:1800:300::/44
2a13:1801:18a::/48
2a13:1801:190::/44
2a13:1802::/44
2a13:8b40:2::/48
2a13:a5c3:1000::/36
2a13:a5c3:2000::/35
2a13:a5c3:4000::/36
2a13:a5c3:f000::/40
2a13:a5c7:1200::/40
2a13:a5c7:1515::/48
2a13:a5c7:1560::/44
2a13:b487:1200::/44
2a13:b487:1bb0::/48
2a13:b487:1bb2::/47
2a13:b487:1bb2::/48
2a13:b487:1bb4::/47
2a13:b487:1bb7::/48
2a13:b487:1bbb::/48
2a13:b487:1f00::/47
2a13:b487:4201::/48
2a13:b487:4202::/48
2a13:b487:4205::/48
2a13:b487:42c0::/43
2a13:df80:6808::/48
2a13:df80:3809::/48
2a13:df80:8000::/38
2c0f:f7a8:8011::/48
2c0f:f7a8:8050::/48

2
homeproxy/root/etc/homeproxy/resources/china_ip6.ver
View File

@ -1 +1 @@
20230923150004
20231023150003

835
homeproxy/root/etc/homeproxy/resources/china_list.txt
View File

File diff suppressed because it is too large Load Diff

2
homeproxy/root/etc/homeproxy/resources/china_list.ver
View File

@ -1 +1 @@
202309232208
202310222208

2
homeproxy/root/etc/homeproxy/resources/gfw_list.ver
View File

@ -1 +1 @@
202309232208
202310222208

2
luci-app-adguardhome/Makefile
View File

@ -8,7 +8,7 @@ PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
LUCI_TITLE:=LuCI app for AdGuardHome
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+!wget-ssl&&!curl:wget-ssl +xz-utils +xz
LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome
LUCI_DESCRIPTION:=LuCI support for AdGuardHome

4
luci-app-adguardhome/root/etc/config/AdGuardHome
View File

@ -7,7 +7,7 @@ config AdGuardHome 'AdGuardHome'
option workdir '/tmp/AdGuardHome'
option logfile '/tmp/AdGuardHome.log'
option verbose '0'
option binpath '/usr/bin/AdGuardHome'
option binpath '/usr/bin/AdGuardHome/AdGuardHome'
option upxflag '-1'
option waitonboot '0'
@ -16,4 +16,4 @@ config AdGuardHome 'AdGuardHome'
list old_redirect 'dnsmasq-upstream'
list old_port '5553'
list old_enabled '0'
option version 'v0.107.26'
option version 'v0.107.26'

4
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View File

@ -162,7 +162,7 @@ return view.extend({
o.value('223.5.5.5', _('Aliyun Public DNS (223.5.5.5)'));
o.value('119.29.29.29', _('Tencent Public DNS (119.29.29.29)'));
o.value('114.114.114.114', _('Xinfeng Public DNS (114.114.114.114)'));
o.default = '208.67.222.222';
o.default = '8.8.8.8';
o.rmempty = false;
o.depends({'routing_mode': 'custom', '!reverse': true});
o.validate = function(section_id, value) {
@ -242,7 +242,7 @@ return view.extend({
o.value('redirect', _('Redirect TCP'));
if (features.hp_has_tproxy)
o.value('redirect_tproxy', _('Redirect TCP + TProxy UDP'));
if (features.hp_has_tun) {
if (features.hp_has_ip_full && features.hp_has_tun) {
o.value('redirect_tun', _('Redirect TCP + Tun UDP'));
o.value('tun', _('Tun TCP/UDP'));
}

12
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
View File

@ -615,14 +615,6 @@ return view.extend({
so.datatype = 'port';
so.depends('type', 'direct');
so = ss.option(form.ListValue, 'proxy_protocol', _('Proxy protocol'),
_('Write Proxy Protocol in the connection header.'));
so.value('', _('Disable'));
so.value('1');
so.value('2');
so.depends('type', 'direct');
so.modalonly = true;
/* Hysteria (2) config start */
so = ss.option(form.ListValue, 'hysteria_protocol', _('Protocol'));
so.value('udp');
@ -956,8 +948,8 @@ return view.extend({
so.modalonly = true;
so = ss.option(form.Value, 'http_method', _('Method'));
so.value('get', _('GET'));
so.value('put', _('PUT'));
so.value('GET', _('GET'));
so.value('PUT', _('PUT'));
so.depends('transport', 'http');
so.modalonly = true;

19
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/server.js
View File

@ -116,7 +116,12 @@ return view.extend({
o.value('vmess', _('VMess'));
o.rmempty = false;
o = s.option(form.Value, 'port', _('Port'),
o = s.option(form.Value, 'address', _('Listen address'));
o.placeholder = '::';
o.datatype = 'ipaddr';
o.modalonly = true;
o = s.option(form.Value, 'port', _('Listen port'),
_('The port must be unique.'));
o.datatype = 'port';
o.validate = L.bind(hp.validateUniqueValue, this, data[0], 'server', 'port');
@ -682,18 +687,6 @@ return view.extend({
o.value(i, hp.dns_strategy[i])
o.modalonly = true;
o = s.option(form.Flag, 'proxy_protocol', _('Proxy protocol'),
_('Parse Proxy Protocol in the connection header.'));
o.default = o.disabled;
o.depends({'network': 'udp', '!reverse': true});
o.modalonly = true;
o = s.option(form.Flag, 'proxy_protocol_accept_no_header', _('Accept no header'),
_('Accept connections without Proxy Protocol header.'));
o.default = o.disabled;
o.depends('proxy_protocol', '1');
o.modalonly = true;
o = s.option(form.ListValue, 'network', _('Network'));
o.value('tcp', _('TCP'));
o.value('udp', _('UDP'));

747
luci-app-homeproxy/po/templates/homeproxy.pot
View File

File diff suppressed because it is too large Load Diff

747
luci-app-homeproxy/po/zh_Hans/homeproxy.po
View File

File diff suppressed because it is too large Load Diff

2
luci-app-homeproxy/root/etc/config/homeproxy
View File

@ -18,7 +18,7 @@ config homeproxy 'infra'
config homeproxy 'config'
option main_node 'nil'
option main_udp_node 'same'
option dns_server '208.67.222.222'
option dns_server '8.8.8.8'
option routing_mode 'bypass_mainland_china'
option routing_port 'common'
option proxy_mode 'redirect_tproxy'

256
luci-app-homeproxy/root/etc/homeproxy/resources/china_ip4.txt
View File

@ -50,6 +50,7 @@
8.144.0.0/14
8.148.0.0/19
8.244.36.0/24
8.244.68.0/24
14.16.0.0/12
14.102.156.0/22
14.103.0.0/18
@ -60,10 +61,8 @@
14.204.0.0/15
14.208.0.0/12
23.26.98.0/24
23.26.134.0/24
23.26.239.0/24
23.144.232.0/24
23.151.168.0/24
27.0.128.0/24
27.0.130.0/23
27.0.132.0/22
@ -118,6 +117,7 @@
37.128.240.0/21
38.6.227.0/24
38.46.0.0/23
38.46.2.0/24
38.60.34.0/24
38.60.40.0/24
38.60.45.0/24
@ -196,13 +196,10 @@
42.248.0.0/15
43.128.0.0/15
43.130.0.0/16
43.131.0.0/17
43.131.128.0/19
43.131.192.0/18
43.131.0.0/18
43.131.224.0/19
43.132.0.0/18
43.132.68.0/24
43.132.70.0/23
43.132.85.0/24
43.132.96.0/19
43.132.128.0/17
43.133.0.0/16
@ -212,17 +209,24 @@
43.135.192.0/19
43.136.0.0/13
43.144.0.0/15
43.152.64.0/19
43.152.64.0/20
43.152.80.0/21
43.152.90.0/23
43.152.92.0/22
43.152.96.0/20
43.152.112.0/22
43.152.192.0/18
43.153.0.0/16
43.154.0.0/15
43.156.0.0/15
43.158.0.0/16
43.158.0.0/17
43.158.192.0/18
43.159.0.0/18
43.159.128.0/17
43.160.0.0/15
43.160.0.0/17
43.160.128.0/19
43.160.192.0/18
43.161.0.0/16
43.162.0.0/16
43.163.192.0/18
43.172.15.0/24
@ -261,10 +265,9 @@
43.227.68.0/24
43.227.104.0/22
43.227.140.0/22
43.227.152.0/21
43.227.152.0/22
43.227.157.0/24
43.227.176.0/21
43.227.192.0/21
43.227.216.0/21
43.227.252.0/22
43.228.0.0/21
43.228.36.0/22
@ -308,8 +311,7 @@
43.240.200.0/23
43.240.204.0/22
43.241.16.0/22
43.241.48.0/24
43.241.50.0/23
43.241.48.0/22
43.241.76.0/22
43.241.180.0/22
43.241.208.0/20
@ -351,7 +353,7 @@
43.248.112.0/21
43.248.128.0/20
43.248.184.0/21
43.248.200.0/22
43.248.192.0/20
43.248.244.0/22
43.249.96.0/24
43.249.136.0/22
@ -371,6 +373,7 @@
43.251.100.0/22
43.251.244.0/22
43.252.48.0/24
43.252.208.0/24
43.252.210.0/23
43.254.0.0/22
43.254.8.0/22
@ -398,7 +401,8 @@
43.255.68.0/22
43.255.84.0/22
43.255.96.0/22
43.255.116.0/22
43.255.116.0/23
43.255.119.0/24
43.255.192.0/22
43.255.212.0/22
43.255.224.0/21
@ -410,13 +414,16 @@
44.31.113.0/24
44.31.212.0/24
44.31.216.0/24
44.159.64.0/22
44.31.231.0/24
44.159.65.0/24
44.159.73.0/24
45.3.32.0/19
45.9.11.0/24
45.12.82.0/24
45.40.192.0/18
45.65.20.0/22
45.65.24.0/22
45.78.80.0/20
45.82.236.0/22
45.86.73.0/24
45.89.104.0/24
@ -434,7 +441,6 @@
45.115.144.0/22
45.115.164.0/22
45.115.200.0/22
45.115.244.0/22
45.116.32.0/22
45.116.52.0/22
45.116.100.0/22
@ -443,6 +449,7 @@
45.116.208.0/22
45.117.8.0/22
45.119.60.0/22
45.119.64.0/24
45.119.68.0/22
45.119.104.0/22
45.119.116.0/22
@ -471,15 +478,17 @@
45.146.82.0/24
45.146.112.0/23
45.147.6.0/24
45.151.47.0/24
45.157.88.0/24
45.158.11.0/24
45.192.184.0/24
45.195.4.0/24
45.195.6.0/23
45.195.6.0/24
45.197.32.0/19
45.202.8.0/23
45.204.24.0/21
45.207.22.0/23
45.207.24.0/22
45.207.26.0/23
45.207.128.0/19
45.207.176.0/20
45.248.8.0/22
@ -524,6 +533,7 @@
47.112.0.0/13
47.120.0.0/15
47.122.0.0/17
47.122.128.0/18
47.123.0.0/16
47.246.0.0/22
47.246.4.0/24
@ -579,6 +589,7 @@
49.239.192.0/18
50.114.63.0/24
50.114.121.0/24
50.114.243.0/24
52.80.0.0/15
52.82.0.0/17
52.82.128.0/23
@ -588,7 +599,6 @@
52.82.136.0/24
52.82.144.0/23
52.82.148.0/22
52.82.153.0/24
52.82.160.0/21
52.82.168.0/24
52.82.170.0/23
@ -709,18 +719,11 @@
61.128.0.0/10
61.232.0.0/14
61.236.0.0/15
61.240.0.0/17
61.240.128.0/18
61.240.192.0/19
61.240.224.0/20
61.240.240.0/21
61.240.0.0/16
61.241.0.0/17
61.241.128.0/18
61.241.192.0/19
61.242.0.0/16
61.243.0.0/17
61.243.128.0/18
61.243.192.0/19
61.242.0.0/15
62.234.0.0/16
63.140.0.0/24
63.140.3.0/24
@ -730,14 +733,14 @@
63.217.81.0/24
63.217.87.0/24
63.243.252.0/24
65.111.0.0/19
66.102.240.0/21
66.102.248.0/22
66.102.252.0/24
66.102.254.0/23
68.79.0.0/18
69.163.104.0/24
69.163.106.0/23
69.163.108.0/24
69.163.106.0/24
69.172.70.0/24
69.230.192.0/18
69.231.128.0/18
@ -787,6 +790,7 @@
101.37.0.0/16
101.38.0.0/15
101.40.0.0/14
101.49.206.0/23
101.50.8.0/21
101.50.56.0/22
101.52.4.0/24
@ -831,6 +835,7 @@
101.198.0.0/22
101.198.128.0/18
101.198.192.0/19
101.199.48.0/20
101.199.97.0/24
101.199.112.0/23
101.199.114.0/24
@ -864,6 +869,7 @@
101.254.64.0/18
101.254.128.0/17
103.1.10.0/23
103.1.158.0/24
103.1.168.0/22
103.2.108.0/22
103.2.208.0/22
@ -937,8 +943,7 @@
103.27.4.0/22
103.27.24.0/22
103.27.176.0/22
103.27.208.0/24
103.27.210.0/23
103.27.208.0/22
103.27.240.0/22
103.28.8.0/24
103.28.204.0/22
@ -972,8 +977,7 @@
103.37.7.0/24
103.37.12.0/22
103.37.16.0/22
103.37.44.0/23
103.37.46.0/24
103.37.44.0/22
103.37.72.0/22
103.37.100.0/22
103.37.136.0/21
@ -990,6 +994,7 @@
103.39.208.0/20
103.39.224.0/21
103.39.232.0/22
103.40.12.0/22
103.40.192.0/22
103.40.232.0/22
103.40.240.0/20
@ -1001,14 +1006,13 @@
103.41.232.0/23
103.42.8.0/22
103.42.76.0/22
103.43.100.0/23
103.43.132.0/23
103.43.172.0/23
103.43.175.0/24
103.43.184.0/22
103.44.56.0/22
103.44.80.0/22
103.44.144.0/22
103.44.144.0/23
103.44.168.0/22
103.44.176.0/22
103.44.236.0/22
@ -1024,13 +1028,13 @@
103.45.172.0/22
103.45.176.0/20
103.45.248.0/22
103.46.12.0/22
103.46.136.0/22
103.46.168.0/22
103.47.48.0/22
103.47.80.0/22
103.48.171.0/24
103.48.232.0/23
103.49.12.0/22
103.49.61.0/24
103.49.62.0/24
103.49.180.0/22
103.49.196.0/22
@ -1048,7 +1052,6 @@
103.54.48.0/22
103.55.172.0/22
103.55.228.0/22
103.56.20.0/22
103.56.32.0/22
103.56.60.0/22
103.56.76.0/22
@ -1059,6 +1062,7 @@
103.57.12.0/22
103.57.139.0/24
103.59.112.0/22
103.59.118.0/23
103.59.122.0/23
103.59.124.0/22
103.59.148.0/22
@ -1071,7 +1075,7 @@
103.61.153.0/24
103.61.154.0/23
103.61.188.0/22
103.62.55.0/24
103.62.52.0/23
103.63.160.0/20
103.63.176.0/21
103.63.244.0/22
@ -1082,6 +1086,7 @@
103.64.208.0/21
103.65.8.0/22
103.66.32.0/22
103.67.52.0/23
103.68.128.0/22
103.68.168.0/24
103.69.16.0/22
@ -1098,7 +1103,6 @@
103.72.32.0/20
103.72.48.0/21
103.72.112.0/23
103.72.123.0/24
103.72.128.0/21
103.72.172.0/24
103.73.48.0/24
@ -1129,6 +1133,7 @@
103.82.52.0/22
103.82.224.0/22
103.83.44.0/22
103.83.72.0/22
103.83.120.0/22
103.84.110.0/24
103.84.138.0/23
@ -1138,6 +1143,7 @@
103.85.168.0/21
103.85.176.0/22
103.85.224.0/22
103.87.180.0/22
103.88.32.0/21
103.88.64.0/22
103.89.184.0/21
@ -1179,6 +1185,8 @@
103.100.64.0/22
103.101.124.0/23
103.101.180.0/22
103.102.4.0/23
103.102.7.0/24
103.102.192.0/21
103.102.200.0/22
103.103.12.0/24
@ -1205,7 +1213,7 @@
103.114.236.0/22
103.115.120.0/22
103.115.248.0/22
103.116.74.0/23
103.116.75.0/24
103.116.76.0/22
103.116.92.0/22
103.116.120.0/23
@ -1221,6 +1229,7 @@
103.119.104.0/22
103.119.224.0/22
103.120.72.0/22
103.120.196.0/22
103.120.224.0/22
103.121.52.0/22
103.121.92.0/22
@ -1242,7 +1251,6 @@
103.131.152.0/22
103.131.168.0/22
103.131.178.0/23
103.132.80.0/23
103.132.212.0/23
103.132.234.0/23
103.133.176.0/22
@ -1264,8 +1272,6 @@
103.141.10.0/23
103.142.96.0/23
103.142.154.0/23
103.142.172.0/23
103.142.190.0/23
103.142.220.0/23
103.142.234.0/23
103.143.16.0/22
@ -1286,10 +1292,12 @@
103.149.181.0/24
103.149.242.0/24
103.149.244.0/22
103.150.10.0/23
103.150.24.0/23
103.150.164.0/23
103.150.181.0/24
103.150.212.0/24
103.151.142.0/23
103.151.148.0/22
103.151.178.0/23
103.151.216.0/23
@ -1311,7 +1319,9 @@
103.156.68.0/23
103.156.174.0/23
103.156.186.0/23
103.157.138.0/23
103.158.0.0/23
103.158.74.0/24
103.159.124.0/23
103.161.220.0/23
103.161.254.0/23
@ -1333,7 +1343,6 @@
103.177.44.0/24
103.179.78.0/23
103.180.108.0/24
103.181.164.0/23
103.181.234.0/24
103.183.66.0/23
103.183.218.0/23
@ -1436,7 +1445,6 @@
103.222.33.0/24
103.222.40.0/22
103.222.176.0/21
103.222.188.0/22
103.222.216.0/22
103.223.132.0/22
103.224.220.0/22
@ -1473,7 +1481,6 @@
103.233.128.0/22
103.233.136.0/23
103.233.138.0/24
103.233.178.0/24
103.234.20.0/22
103.234.54.0/24
103.234.56.0/22
@ -1488,11 +1495,10 @@
103.235.220.0/22
103.235.224.0/19
103.236.120.0/22
103.236.224.0/23
103.236.224.0/24
103.236.240.0/20
103.237.8.0/22
103.237.28.0/23
103.237.101.0/24
103.237.103.0/24
103.237.248.0/21
103.238.0.0/21
@ -1580,10 +1586,12 @@
103.255.88.0/21
103.255.140.0/22
103.255.200.0/22
104.167.16.0/20
104.192.108.0/23
104.192.110.0/24
104.193.88.0/23
104.193.90.0/24
104.207.32.0/19
106.0.4.0/22
106.2.16.0/20
106.2.32.0/19
@ -1633,7 +1641,6 @@
106.224.0.0/14
106.228.0.0/15
106.230.0.0/16
107.151.251.0/24
108.165.168.0/24
109.244.0.0/16
110.6.0.0/15
@ -1648,6 +1655,7 @@
110.41.0.0/16
110.42.0.0/15
110.44.12.0/22
110.44.144.0/20
110.51.0.0/16
110.52.0.0/15
110.56.0.0/13
@ -1661,7 +1669,23 @@
110.77.0.0/17
110.80.0.0/13
110.88.0.0/14
110.96.0.0/11
110.96.0.0/14
110.100.0.0/15
110.103.0.0/19
110.103.32.0/20
110.104.0.0/17
110.104.128.0/19
110.105.0.0/16
110.106.0.0/15
110.110.0.0/15
110.112.0.0/15
110.114.0.0/16
110.115.128.0/17
110.116.0.0/16
110.118.0.0/16
110.120.0.0/14
110.124.0.0/15
110.126.0.0/16
110.152.0.0/14
110.156.0.0/15
110.166.0.0/15
@ -1749,6 +1773,7 @@
113.31.144.0/20
113.31.160.0/19
113.31.192.0/18
113.48.48.0/20
113.50.0.0/20
113.50.32.0/24
113.50.48.0/20
@ -1829,6 +1854,7 @@
114.113.221.0/24
114.113.223.0/24
114.113.224.0/20
114.114.112.0/21
114.115.0.0/16
114.116.0.0/15
114.118.0.0/17
@ -1875,7 +1901,6 @@
116.16.0.0/12
116.52.0.0/14
116.56.0.0/15
116.58.208.0/20
116.62.0.0/15
116.66.36.0/24
116.66.48.0/21
@ -1954,6 +1979,7 @@
116.248.0.0/15
116.252.0.0/15
116.254.104.0/21
116.254.192.0/18
116.255.128.0/17
117.8.0.0/13
117.21.0.0/16
@ -2113,8 +2139,7 @@
118.193.173.0/24
118.194.32.0/19
118.194.128.0/21
118.194.160.0/21
118.194.172.0/22
118.194.164.0/22
118.194.240.0/21
118.195.0.0/16
118.199.0.0/16
@ -2235,7 +2260,8 @@
119.164.0.0/14
119.176.0.0/12
119.233.128.0/17
119.235.128.0/22
119.235.128.0/24
119.235.130.0/24
119.235.136.0/24
119.235.138.0/24
119.235.143.0/24
@ -2297,7 +2323,7 @@
120.132.0.0/18
120.132.64.0/19
120.132.96.0/20
120.132.112.0/23
120.132.112.0/24
120.132.116.0/22
120.132.120.0/21
120.132.128.0/17
@ -2429,7 +2455,7 @@
123.52.0.0/14
123.56.0.0/15
123.58.0.0/18
123.58.64.0/23
123.58.64.0/24
123.58.96.0/19
123.58.160.0/19
123.58.224.0/19
@ -2437,10 +2463,6 @@
123.60.0.0/15
123.64.0.0/12
123.80.0.0/13
123.88.140.0/22
123.88.180.0/22
123.88.184.0/21
123.89.148.0/22
123.90.0.0/15
123.92.0.0/14
123.96.0.0/15
@ -2483,7 +2505,9 @@
124.14.8.0/22
124.14.12.0/23
124.14.15.0/24
124.14.16.0/21
124.14.16.0/23
124.14.18.0/24
124.14.20.0/22
124.14.64.0/18
124.14.224.0/19
124.16.0.0/15
@ -2603,7 +2627,6 @@
132.232.0.0/16
132.237.134.0/24
134.175.0.0/16
134.195.121.0/24
136.0.92.0/24
139.5.60.0/22
139.9.0.0/18
@ -2643,7 +2666,6 @@
139.224.0.0/16
139.226.0.0/15
140.75.0.0/16
140.99.185.0/24
140.143.0.0/16
140.179.0.0/16
140.205.0.0/16
@ -2700,10 +2722,12 @@
146.222.94.0/24
147.78.132.0/22
148.70.0.0/16
149.115.122.0/23
149.115.124.0/24
149.127.218.0/24
150.107.0.0/23
150.109.0.0/16
150.129.40.0/24
150.129.136.0/22
150.129.192.0/22
150.129.252.0/22
@ -2734,10 +2758,11 @@
153.118.0.0/15
153.254.119.0/24
154.8.128.0/17
154.19.37.0/24
154.39.71.0/24
154.48.252.0/24
154.72.40.0/21
154.72.40.0/22
154.72.44.0/24
154.72.47.0/24
154.83.28.0/24
154.85.32.0/21
154.85.40.0/22
@ -2745,8 +2770,7 @@
154.85.48.0/20
154.91.32.0/23
154.91.34.0/24
154.194.2.0/23
154.194.64.0/24
154.195.4.0/24
154.196.4.0/22
154.196.8.0/21
154.197.56.0/21
@ -2788,10 +2812,11 @@
156.240.88.0/22
156.240.112.0/20
156.241.8.0/21
156.242.4.0/23
156.242.5.0/24
156.242.6.0/24
156.242.8.0/24
156.247.16.0/20
156.253.32.0/20
156.254.32.0/19
156.254.64.0/19
156.254.96.0/20
@ -2821,9 +2846,20 @@
161.189.0.0/16
161.207.0.0/16
162.14.0.0/16
162.62.0.0/17
162.62.128.0/18
162.62.192.0/19
162.62.10.0/23
162.62.14.0/23
162.62.42.0/23
162.62.48.0/20
162.62.64.0/20
162.62.80.0/21
162.62.96.0/19
162.62.128.0/23
162.62.132.0/22
162.62.136.0/21
162.62.144.0/20
162.62.160.0/21
162.62.168.0/22
162.62.208.0/20
162.62.224.0/20
162.105.0.0/16
163.0.0.0/16
@ -2886,12 +2922,12 @@
163.181.132.0/23
163.181.135.0/24
163.181.136.0/22
163.181.140.0/24
163.181.140.0/23
163.181.144.0/22
163.181.148.0/23
163.181.153.0/24
163.181.160.0/24
163.181.163.0/24
163.181.162.0/23
163.204.0.0/16
163.228.0.0/16
163.244.246.0/24
@ -2910,7 +2946,6 @@
168.160.168.0/24
168.160.224.0/19
170.106.0.0/16
170.225.224.0/23
171.8.0.0/13
171.34.0.0/15
171.36.0.0/14
@ -2951,7 +2986,6 @@
175.188.188.0/22
175.190.24.0/21
175.190.126.0/23
176.105.231.0/24
176.126.105.0/24
180.76.0.0/14
180.84.0.0/15
@ -3058,6 +3092,7 @@
185.75.172.0/23
185.75.174.0/24
185.216.248.0/22
185.225.1.0/24
185.229.222.0/24
185.234.214.0/23
185.255.152.0/23
@ -3081,7 +3116,6 @@
194.127.229.0/24
194.138.202.0/23
194.138.245.0/24
195.180.157.0/24
195.242.242.0/24
198.8.58.0/23
198.175.100.0/22
@ -3351,7 +3385,6 @@
203.79.0.0/20
203.80.57.0/24
203.80.144.0/20
203.81.16.0/20
203.82.0.0/23
203.83.56.0/21
203.86.0.0/18
@ -3394,6 +3427,7 @@
203.107.6.0/24
203.107.13.0/24
203.107.20.0/22
203.107.24.0/24
203.107.26.0/23
203.107.28.0/22
203.107.32.0/19
@ -3448,7 +3482,10 @@
203.166.186.0/23
203.166.188.0/23
203.166.191.0/24
203.168.0.0/19
203.168.0.0/23
203.168.2.0/24
203.168.16.0/23
203.168.18.0/24
203.168.229.0/24
203.170.58.0/23
203.174.4.0/24
@ -3471,7 +3508,9 @@
203.192.16.0/24
203.192.24.0/23
203.193.224.0/19
203.194.120.0/21
203.194.120.0/22
203.194.124.0/24
203.194.126.0/23
203.195.64.0/19
203.195.112.0/21
203.195.128.0/17
@ -3483,7 +3522,8 @@
203.205.136.0/21
203.205.144.0/22
203.205.155.0/24
203.205.156.0/22
203.205.156.0/23
203.205.159.0/24
203.205.188.0/24
203.205.191.0/24
203.205.192.0/21
@ -3504,6 +3544,7 @@
203.207.208.0/20
203.207.224.0/19
203.208.32.0/19
203.208.184.0/24
203.209.224.0/19
203.212.0.0/20
203.212.80.0/23
@ -3513,7 +3554,6 @@
203.223.21.0/24
203.223.23.0/24
204.14.76.0/24
204.114.176.0/23
206.161.216.0/23
206.161.218.0/24
207.226.136.0/23
@ -3654,11 +3694,7 @@
211.99.28.0/23
211.99.30.0/24
211.99.32.0/19
211.99.64.0/19
211.99.96.0/20
211.99.112.0/21
211.99.120.0/23
211.99.122.0/24
211.99.64.0/18
211.99.128.0/17
211.100.0.0/17
211.100.192.0/20
@ -3671,7 +3707,6 @@
211.102.128.0/18
211.102.192.0/23
211.102.208.0/20
211.102.240.0/20
211.103.0.0/16
211.136.0.0/13
211.144.9.0/24
@ -3816,6 +3851,7 @@
212.64.0.0/17
212.129.128.0/17
216.228.126.0/24
217.114.35.0/24
218.0.0.0/11
218.56.0.0/13
218.64.0.0/11
@ -4006,9 +4042,10 @@
221.129.248.0/23
221.129.252.0/24
221.130.0.0/15
221.133.224.0/21
221.133.225.0/24
221.133.226.0/23
221.133.228.0/22
221.133.232.0/22
221.133.238.0/24
221.133.240.0/20
221.137.0.0/16
221.172.0.0/14
@ -4027,23 +4064,23 @@
222.32.0.0/11
222.64.0.0/11
222.125.0.0/16
222.126.128.0/21
222.126.136.0/22
222.126.128.0/22
222.126.132.0/23
222.126.140.0/23
222.126.144.0/20
222.126.160.0/21
222.126.168.0/22
222.126.172.0/23
222.126.174.0/24
222.126.176.0/20
222.126.192.0/21
222.126.204.0/22
222.126.208.0/22
222.126.176.0/21
222.126.192.0/22
222.126.196.0/23
222.126.208.0/23
222.126.212.0/23
222.126.216.0/22
222.126.220.0/24
222.126.222.0/23
222.126.224.0/19
222.126.216.0/23
222.126.228.0/23
222.126.236.0/22
222.126.240.0/20
222.128.0.0/12
222.160.0.0/14
222.168.0.0/13
@ -4051,7 +4088,16 @@
222.192.0.0/11
222.240.0.0/13
222.248.0.0/15
223.0.0.0/16
223.0.1.0/24
223.0.2.0/24
223.0.8.0/23
223.0.10.0/24
223.0.12.0/23
223.0.15.0/24
223.0.16.0/24
223.0.20.0/24
223.0.30.0/24
223.0.126.0/24
223.2.0.0/15
223.4.0.0/14
223.8.0.0/13

2
luci-app-homeproxy/root/etc/homeproxy/resources/china_ip4.ver
View File

@ -1 +1 @@
20230923150004
20231023150003

215
luci-app-homeproxy/root/etc/homeproxy/resources/china_ip6.txt
View File

@ -24,7 +24,6 @@
2001:df3:b380::/48
2001:df5:7800::/48
2001:df7:1480::/48
2001:ca48::/32
2400:1160::/32
2400:3200::/32
2400:3f60:3::/48
@ -32,7 +31,6 @@
2400:5400:10::/48
2400:58a0:1400::/48
2400:58a0:1402::/48
2400:5a60::/48
2400:6460::/40
2400:6600::/32
2400:70e0:bed::/48
@ -70,7 +68,7 @@
2400:9380:8201::/48
2400:9380:8221::/48
2400:9380:8301::/48
2400:9380:9000::/47
2400:9380:9001::/48
2400:9380:9002::/48
2400:9380:9005::/48
2400:9380:9009::/48
@ -120,7 +118,6 @@
2401:1160::/32
2401:1320::/32
2401:13a0:1::/48
2401:13a0:2::/48
2401:1740:2000::/48
2401:1d40::/32
2401:2e00::/32
@ -196,7 +193,6 @@
2402:db40::/33
2402:dfc0::/44
2402:dfc0:50::/44
2402:e380:15::/48
2402:e380:100::/40
2402:e480::/32
2402:e740::/32
@ -205,6 +201,7 @@
2402:f000::/32
2402:f8c0::/47
2403:600:a604::/46
2403:600:a608::/48
2403:600:b001::/48
2403:c80::/32
2403:1b80::/48
@ -301,6 +298,7 @@
2404:7240::/33
2404:7600::/32
2404:7940::/32
2404:7ac0:607::/48
2404:8d02:28c8::/48
2404:8d02:4881::/48
2404:c2c0::/40
@ -314,7 +312,6 @@
2404:c300::/32
2404:c940::/48
2404:d7c0:2::/48
2404:de80:400::/40
2404:e280::/47
2404:e5c0::/32
2404:e8c0::/32
@ -344,9 +341,7 @@
2405:6940::/48
2405:6f00:c602::/48
2405:7040:6000::/47
2405:78c0:6e0e::/48
2405:78c0:6e1e::/48
2405:84c0:fdfc::/46
2405:78c0:6e00::/43
2405:8a40::/32
2405:a900::/32
2405:ad00::/32
@ -363,17 +358,19 @@
2406:840:20::/48
2406:840:44::/47
2406:840:78::/48
2406:840:80::/47
2406:840:90::/48
2406:840:100::/47
2406:840:111::/48
2406:840:1c0::/48
2406:840:301::/48
2406:840:380::/48
2406:840:3c0::/48
2406:840:410::/48
2406:840:800::/42
2406:840:840::/47
2406:840:860::/48
2406:840:880::/48
2406:840:950::/48
2406:840:a00::/47
2406:840:a10::/48
2406:840:c00::/47
@ -397,16 +394,17 @@
2406:840:9100::/47
2406:840:9102::/48
2406:840:9200::/40
2406:840:9300::/47
2406:840:95a1::/48
2406:840:9300::/48
2406:840:9680::/44
2406:840:9700::/40
2406:840:9801::/48
2406:840:9810::/48
2406:840:9814::/46
2406:840:981c::/46
2406:840:9900::/44
2406:840:9960::/44
2406:840:9980::/48
2406:840:9998::/47
2406:840:9ef0::/44
2406:840:c0a8::/48
2406:840:e010::/47
@ -417,12 +415,15 @@
2406:840:e03f::/48
2406:840:e080::/44
2406:840:e0cf::/48
2406:840:e0e0::/44
2406:840:e10f::/48
2406:840:e140::/47
2406:840:e14f::/48
2406:840:e180::/44
2406:840:e20f::/48
2406:840:e300::/44
2406:840:e280::/47
2406:840:e300::/48
2406:840:e302::/48
2406:840:e340::/44
2406:840:e360::/48
2406:840:e36f::/48
@ -432,26 +433,28 @@
2406:840:e574::/48
2406:840:e576::/48
2406:840:e57b::/48
2406:840:e57c::/48
2406:840:e57f::/48
2406:840:e666::/47
2406:840:e720::/48
2406:840:e770::/48
2406:840:e777::/48
2406:840:e80f::/48
2406:840:e840::/48
2406:840:e842::/48
2406:840:e84a::/47
2406:840:e841::/48
2406:840:e84a::/48
2406:840:e84f::/48
2406:840:eabf::/48
2406:840:eb00::/45
2406:840:eb0b::/48
2406:840:eb80::/42
2406:840:eee4::/47
2406:840:eeee::/48
2406:840:efa0::/44
2406:840:f000::/44
2406:840:f0a1::/48
2406:840:f0aa::/48
2406:840:f100::/47
2406:840:f200::/44
2406:840:f230::/44
2406:840:f380::/44
2406:840:f40f::/48
2406:840:f440::/47
@ -468,10 +471,9 @@
2406:840:fd06::/48
2406:840:fd1f::/48
2406:840:fe27::/48
2406:840:fe50::/48
2406:840:fe60::/48
2406:840:fe72::/47
2406:840:fe80::/48
2406:840:fe90::/48
2406:840:fed1::/48
2406:840:fed2::/47
2406:840:fed4::/47
@ -524,7 +526,8 @@
2407:c080::/35
2407:c080:4000::/37
2407:c080:5000::/37
2407:d340:7921::/48
2407:c080:8000::/36
2407:d340:8900::/44
2408:4000::/22
2408:8000::/48
2408:8000:2::/47
@ -1063,6 +1066,7 @@
240d:c000:2000::/35
240d:c000:6000::/36
240d:c010::/47
240d:c010:11::/48
240d:c010:14::/48
240d:c010:16::/48
240d:c010:20::/44
@ -1077,6 +1081,7 @@
240e::/20
2602:2a3::/40
2602:2a4:ff::/48
2602:fa1c:121::/48
2602:faac::/40
2602:fab0:11::/48
2602:fbda:600::/48
@ -1104,7 +1109,6 @@
2602:feda:2f0::/48
2602:feda:3c5::/48
2602:feda:ab2::/48
2602:feda:ae7::/48
2602:feda:af3::/48
2602:feda:b8f::/48
2602:feda:ca1::/48
@ -1162,22 +1166,17 @@
2a05:1085::/32
2a05:1086:f000::/47
2a05:1087::/32
2a05:dfc1:1600::/40
2a05:dfc1:5901::/48
2a05:dfc1:5902::/47
2a05:dfc1:5904::/47
2a05:dfc1:5906::/48
2a05:dfc1:5983::/48
2a05:dfc1:5984::/48
2a05:dfc1:1603::/48
2a05:dfc1:1604::/46
2a05:dfc1:16b0::/45
2a05:dfc1:16ff::/48
2a05:dfc1:5a00::/40
2a05:dfc1:7100::/46
2a05:dfc1:7104::/47
2a05:dfc1:8c00::/46
2a05:dfc1:8c04::/47
2a05:dfc1:8c0f::/48
2a05:dfc1:8c90::/46
2a05:dfc1:8c94::/47
2a05:dfc1:8d00::/47
2a05:dfc1:8c01::/48
2a05:dfc1:8c90::/47
2a05:dfc1:8c96::/47
2a05:dfc1:8c98::/47
2a05:dfc1:8d00::/48
2a05:dfc1:8d02::/48
2a06:1287:300::/40
2a06:a001:a0c4::/48
@ -1188,9 +1187,12 @@
2a06:a005:8da::/48
2a06:a005:91f::/48
2a06:a005:9c0::/48
2a06:a005:d22::/48
2a06:a005:d47::/48
2a06:a005:d48::/48
2a06:a005:f80::/44
2a06:a005:1340::/43
2a06:a005:13b0::/44
2a06:a005:13c0::/43
2a06:a005:13e0::/47
2a06:a005:13e8::/48
2a06:a005:13ea::/47
@ -1199,12 +1201,11 @@
2a06:a005:1700::/44
2a06:a005:1800::/48
2a06:a005:1b60::/44
2a06:a005:1c40::/44
2a06:a005:1ee0::/44
2a06:a005:2040::/44
2a06:a005:2100::/44
2a06:a005:2200::/44
2a06:a005:2510::/48
2a06:a005:28f1::/48
2a06:a005:28f3::/48
2a06:a005:28f4::/48
2a06:a005:2921::/48
@ -1218,42 +1219,57 @@
2a06:a005:29d1::/48
2a06:a005:2a00::/42
2a06:a005:2af0::/44
2a06:de00:de04::/47
2a06:de00:de04::/48
2a06:de00:de0e::/48
2a06:de01:809::/48
2a06:de01:814::/48
2a06:de01:83c::/48
2a06:de01:848::/48
2a06:de01:84d::/48
2a06:de01:850::/48
2a06:de01:85b::/48
2a06:de01:896::/47
2a06:de01:89b::/48
2a06:de01:8c3::/48
2a06:de01:8cd::/48
2a06:de01:8d1::/48
2a06:de01:901::/48
2a06:de01:90e::/48
2a06:de01:92e::/48
2a06:de01:801::/48
2a06:de01:825::/48
2a06:de01:828::/48
2a06:de01:82e::/48
2a06:de01:834::/48
2a06:de01:849::/48
2a06:de01:862::/48
2a06:de01:86e::/48
2a06:de01:898::/48
2a06:de01:8a2::/48
2a06:de01:8b1::/48
2a06:de01:8b7::/48
2a06:de01:8c7::/48
2a06:de01:8d7::/48
2a06:de01:8dc::/48
2a06:de01:8ee::/48
2a06:de01:8fd::/48
2a06:de01:907::/48
2a06:de01:912::/48
2a06:de01:93b::/48
2a06:de01:93c::/47
2a06:de01:946::/48
2a06:de01:95e::/48
2a06:de01:94b::/48
2a06:de01:96e::/48
2a06:de01:973::/48
2a06:de01:989::/48
2a06:de01:9a9::/48
2a06:de01:9b3::/48
2a06:de01:a00::/48
2a06:de01:a2c::/48
2a06:de01:a33::/48
2a06:de01:a55::/48
2a06:de01:a66::/48
2a06:de01:a6c::/48
2a06:de01:ae8::/48
2a06:de01:aeb::/48
2a06:de01:aec::/48
2a06:de01:981::/48
2a06:de01:982::/47
2a06:de01:99f::/48
2a06:de01:a04::/48
2a06:de01:a0a::/48
2a06:de01:a1d::/48
2a06:de01:a3b::/48
2a06:de01:a3e::/48
2a06:de01:a42::/48
2a06:de01:a44::/48
2a06:de01:a51::/48
2a06:de01:a53::/48
2a06:de01:a6a::/48
2a06:de01:a70::/48
2a06:de01:a7f::/48
2a06:de01:ac4::/48
2a06:de01:ace::/48
2a06:de01:ad3::/48
2a06:de01:af5::/48
2a06:de01:afa::/48
2a06:de01:b07::/48
2a06:de01:b13::/48
2a06:de01:b25::/48
2a06:de01:b1e::/48
2a06:de01:b29::/48
2a06:de01:b34::/48
2a06:e881:2509::/48
2a06:e881:5501::/48
2a06:e881:5502::/48
@ -1266,10 +1282,7 @@
2a0a:280:2d00::/46
2a0a:280:2d04::/47
2a0a:2840:20::/43
2a0a:2842:100::/48
2a0a:2842:416::/48
2a0a:2845:aab8::/46
2a0a:2845:d647::/48
2a0a:6040:c00::/40
2a0a:6040:e01::/48
2a0a:6040:e02::/47
@ -1355,14 +1368,17 @@
2a0c:b641:510::/48
2a0c:b641:570::/47
2a0c:b641:730::/44
2a0c:b641:a10::/47
2a0c:b641:a11::/48
2a0c:b641:a13::/48
2a0c:b641:a60::/44
2a0d:2146:8040::/48
2a0d:2406:510::/46
2a0d:2580:ff00::/45
2a0d:2580:ff08::/46
2a0d:2581:fffc::/48
2a0d:2581:fffe::/47
2a0d:2586::/48
2a0d:2586:1000::/48
2a0d:2683:2::/48
2a0d:2687::/32
2a0d:2904::/44
@ -1373,11 +1389,11 @@
2a0e:800:ff40::/42
2a0e:8f02:2182::/47
2a0e:8f02:f006::/48
2a0e:8f02:f055::/48
2a0e:8f02:f058::/48
2a0e:97c0:220::/44
2a0e:97c0:550::/44
2a0e:97c0:5ef::/48
2a0e:97c0:68f::/48
2a0e:97c0:804::/46
2a0e:97c0:83f::/48
2a0e:aa01:1fff::/48
@ -1394,9 +1410,6 @@
2a0e:aa07:e039::/48
2a0e:aa07:e03a::/48
2a0e:aa07:e043::/48
2a0e:aa07:e044::/48
2a0e:aa07:e046::/48
2a0e:aa07:e049::/48
2a0e:aa07:e050::/44
2a0e:aa07:e060::/48
2a0e:aa07:e070::/47
@ -1406,6 +1419,7 @@
2a0e:aa07:e0f7::/48
2a0e:aa07:e120::/44
2a0e:aa07:e141::/48
2a0e:aa07:e142::/47
2a0e:aa07:e150::/44
2a0e:aa07:e200::/44
2a0e:aa07:f000::/48
@ -1413,8 +1427,10 @@
2a0e:aa07:f009::/48
2a0e:aa07:f041::/48
2a0e:aa07:f042::/48
2a0e:aa07:f0e0::/44
2a0e:b107:24::/48
2a0e:aa07:f0d0::/47
2a0e:aa07:f0d2::/48
2a0e:aa07:f0d4::/47
2a0e:aa07:f0d6::/48
2a0e:b107:30::/48
2a0e:b107:32::/47
2a0e:b107:a0::/44
@ -1422,13 +1438,10 @@
2a0e:b107:272::/48
2a0e:b107:4e0::/48
2a0e:b107:710::/48
2a0e:b107:790::/44
2a0e:b107:bd0::/48
2a0e:b107:c10::/48
2a0e:b107:da0::/44
2a0e:b107:dce::/48
2a0e:b107:f4a::/48
2a0e:b107:f4f::/48
2a0e:b107:1476::/47
2a0e:b107:14a0::/44
2a0e:b107:16b0::/44
@ -1439,17 +1452,26 @@
2a0e:b107:1d20::/47
2a0e:b107:1d25::/48
2a0e:b107:1e50::/44
2a0e:b107:21c0::/44
2a0e:b107:2220::/44
2a0e:b107:21c0::/43
2a0e:b107:2210::/44
2a0e:b107:2220::/43
2a0e:b107:2240::/42
2a0e:b107:2290::/44
2a0e:b107:22a0::/43
2a0e:b107:22c0::/42
2a0e:b107:2300::/40
2a0e:b107:2400::/45
2a0e:b107:2410::/44
2a0e:b107:2480::/45
2a0f:5707:ac01::/48
2a0f:5707:fff4::/47
2a0f:5707:fe01::/48
2a0f:5707:fff4::/48
2a0f:7803:fc00::/39
2a0f:7803:ff10::/47
2a0f:7803:ff10::/48
2a0f:7803:ffd1::/48
2a0f:7980::/44
2a0f:85c1:30::/47
2a0f:85c1:100::/47
2a0f:9400:6907::/48
2a0f:9400:7700::/48
2a0f:e401:131::/48
2a0f:e401:133::/48
@ -1469,7 +1491,6 @@
2a10:ccc0:ccc::/48
2a10:ccc0:ccc5::/48
2a10:ccc0:ccc6::/48
2a10:ccc0:ccc8::/48
2a10:ccc0:cccc::/46
2a11:f2c0:ffc4::/48
2a12:3fc2:6600::/48
@ -1477,35 +1498,41 @@
2a12:3fc2:aa10::/44
2a12:3fc2:aa40::/44
2a12:3fc2:ab50::/48
2a12:3fc2:e600::/40
2a12:3fc2:e72e::/48
2a12:3fc2:e800::/46
2a12:3fc2:e810::/44
2a12:3fc7::/48
2a12:3fc7:8000::/48
2a12:dd47:5c00::/40
2a12:f8c0:1000::/39
2a12:f8c0:1000::/40
2a12:f8c0:1200::/40
2a12:f8c1::/48
2a12:f8c3::/36
2a13:1800::/48
2a13:1800:10::/48
2a13:1800:80::/44
2a13:1800:300::/44
2a13:1801:18a::/48
2a13:1801:190::/44
2a13:1802::/44
2a13:8b40:2::/48
2a13:a5c3:1000::/36
2a13:a5c3:2000::/35
2a13:a5c3:4000::/36
2a13:a5c3:f000::/40
2a13:a5c7:1200::/40
2a13:a5c7:1515::/48
2a13:a5c7:1560::/44
2a13:b487:1200::/44
2a13:b487:1bb0::/48
2a13:b487:1bb2::/47
2a13:b487:1bb2::/48
2a13:b487:1bb4::/47
2a13:b487:1bb7::/48
2a13:b487:1bbb::/48
2a13:b487:1f00::/47
2a13:b487:4201::/48
2a13:b487:4202::/48
2a13:b487:4205::/48
2a13:b487:42c0::/43
2a13:df80:6808::/48
2a13:df80:3809::/48
2a13:df80:8000::/38
2c0f:f7a8:8011::/48
2c0f:f7a8:8050::/48

2
luci-app-homeproxy/root/etc/homeproxy/resources/china_ip6.ver
View File

@ -1 +1 @@
20230923150004
20231023150003

835
luci-app-homeproxy/root/etc/homeproxy/resources/china_list.txt
View File

File diff suppressed because it is too large Load Diff

2
luci-app-homeproxy/root/etc/homeproxy/resources/china_list.ver
View File

@ -1 +1 @@
202309232208
202310222208

2
luci-app-homeproxy/root/etc/homeproxy/resources/gfw_list.ver
View File

@ -1 +1 @@
202309232208
202310222208

3
luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc
View File

@ -132,7 +132,6 @@ function generate_outbound(node) {
/* Direct */
override_address: node.override_address,
override_port: strToInt(node.override_port),
proxy_protocol: strToInt(node.proxy_protocol),
/* Hysteria (2) */
up_mbps: strToInt(node.hysteria_down_mbps),
down_mbps: strToInt(node.hysteria_down_mbps),
@ -172,7 +171,7 @@ function generate_outbound(node) {
packet_encoding: node.packet_encoding,
/* WireGuard */
system_interface: (node.type === 'wireguard') || null,
interface_name: (node.type === 'wireguard') ? 'singwg-cfg-' + node['.name'] + '-out' : null,
interface_name: (node.type === 'wireguard') ? 'wg-' + node['.name'] + '-out' : null,
local_address: node.wireguard_local_address,
private_key: node.wireguard_private_key,
peer_public_key: node.wireguard_peer_public_key,

4
luci-app-homeproxy/root/etc/homeproxy/scripts/generate_server.uc
View File

@ -44,7 +44,7 @@ uci.foreach(uciconfig, uciserver, (cfg) => {
type: cfg.type,
tag: 'cfg-' + cfg['.name'] + '-in',
listen: '::',
listen: cfg.address || '::',
listen_port: strToInt(cfg.port),
tcp_fast_open: strToBool(cfg.tcp_fast_open),
tcp_multi_path: strToBool(cfg.tcp_multi_path),
@ -52,8 +52,6 @@ uci.foreach(uciconfig, uciserver, (cfg) => {
sniff: true,
sniff_override_destination: (cfg.sniff_override === '1'),
domain_strategy: cfg.domain_strategy,
proxy_protocol: strToBool(cfg.proxy_protocol),
proxy_protocol_accept_no_header: strToBool(cfg.proxy_protocol_accept_no_header),
network: cfg.network,
/* Hysteria */

2
luci-app-homeproxy/root/etc/homeproxy/scripts/homeproxy.uc
View File

@ -78,7 +78,7 @@ export function wGET(url) {
if (!url || type(url) !== 'string')
return null;
const output = executeCommand(`/usr/bin/wget -qO- --user-agent 'Wget/1.21 (HomeProxy)' --timeout=10 ${shellQuote(url)}`) || {};
const output = executeCommand(`/usr/bin/wget -qO- --user-agent 'Wget/1.21 (HomeProxy, like v2rayN)' --timeout=10 ${shellQuote(url)}`) || {};
return trim(output.stdout);
};
/* Utilities end */

213
luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc
View File

@ -80,7 +80,7 @@ function log(...args) {
}
function parse_uri(uri) {
let config;
let config, url, params;
if (type(uri) === 'object') {
if (uri.nodetype === 'sip008') {
@ -102,26 +102,26 @@ function parse_uri(uri) {
switch (uri[0]) {
case 'http':
case 'https':
const http_url = parseURL('http://' + uri[1]);
url = parseURL('http://' + uri[1]);
config = {
label: http_url.hash ? urldecode(http_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'http',
address: http_url.hostname,
port: http_url.port,
username: http_url.username ? urldecode(http_url.username) : null,
password: http_url.password ? urldecode(http_url.password) : null,
address: url.hostname,
port: url.port,
username: url.username ? urldecode(url.username) : null,
password: url.password ? urldecode(url.password) : null,
tls: (uri[0] === 'https') ? '1' : '0'
};
break;
case 'hysteria':
/* https://github.com/HyNetwork/hysteria/wiki/URI-Scheme */
const hysteria_url = parseURL('http://' + uri[1]),
hysteria_params = hysteria_url.searchParams;
url = parseURL('http://' + uri[1]);
params = url.searchParams;
if (!sing_features.with_quic || (hysteria_params.protocol && hysteria_params.protocol !== 'udp')) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria', urldecode(hysteria_url.hash) || hysteria_url.hostname));
if (!sing_features.with_quic || (params.protocol && params.protocol !== 'udp')) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria', urldecode(url.hash) || url.hostname));
if (!sing_features.with_quic)
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
@ -129,31 +129,32 @@ function parse_uri(uri) {
}
config = {
label: hysteria_url.hash ? urldecode(hysteria_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'hysteria',
address: hysteria_url.hostname,
port: hysteria_url.port,
hysteria_protocol: hysteria_params.protocol || 'udp',
hysteria_auth_type: hysteria_params.auth ? 'string' : null,
hysteria_auth_payload: hysteria_params.auth,
hysteria_obfs_password: hysteria_params.obfsParam,
hysteria_down_mbps: hysteria_params.downmbps,
hysteria_up_mbps: hysteria_params.upmbps,
address: url.hostname,
port: url.port,
hysteria_protocol: params.protocol || 'udp',
hysteria_auth_type: params.auth ? 'string' : null,
hysteria_auth_payload: params.auth,
hysteria_obfs_password: params.obfsParam,
hysteria_down_mbps: params.downmbps,
hysteria_up_mbps: params.upmbps,
tls: '1',
tls_insecure: (hysteria_params.insecure in ['true', '1']) ? '1' : '0',
tls_sni: hysteria_params.peer,
tls_alpn: hysteria_params.alpn
tls_insecure: (params.insecure in ['true', '1']) ? '1' : '0',
tls_sni: params.peer,
tls_alpn: params.alpn
};
break;
case 'hysteria2':
case 'hy2':
/* https://v2.hysteria.network/docs/developers/URI-Scheme/ */
const hysteria2_url = parseURL('http://' + uri[1]),
hysteria2_params = hysteria2_url.searchParams;
url = parseURL('http://' + uri[1]);
params = url.searchParams;
if (!sing_features.with_quic || (hysteria2_params.password)) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria2', urldecode(hysteria2_url.hash) || hysteria2_url.hostname));
/* userpass auth is not supported by sing-box */
if (!sing_features.with_quic || (params.password)) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria2', urldecode(url.hash) || url.hostname));
if (!sing_features.with_quic)
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
@ -161,16 +162,16 @@ function parse_uri(uri) {
}
config = {
label: hysteria2_url.hash ? urldecode(hysteria2_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'hysteria2',
address: hysteria2_url.hostname,
port: hysteria2_url.port,
password: hysteria2_url.password ? urldecode(hysteria2_url.password) : null,
hysteria_obfs_type: hysteria2_params.obfs,
hysteria_obfs_password: hysteria2_params['obfs-password'],
address: url.hostname,
port: url.port,
password: url.password ? urldecode(url.password) : null,
hysteria_obfs_type: params.obfs,
hysteria_obfs_password: params['obfs-password'],
tls: '1',
tls_insecure: hysteria2_params.insecure ? '1' : '0',
tls_sni: hysteria2_params.sni
tls_insecure: params.insecure ? '1' : '0',
tls_sni: params.sni
};
break;
@ -179,15 +180,15 @@ function parse_uri(uri) {
case 'socks4a':
case 'socsk5':
case 'socks5h':
const socks_url = parseURL('http://' + uri[1]);
url = parseURL('http://' + uri[1]);
config = {
label: socks_url.hash ? urldecode(socks_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'socks',
address: socks_url.hostname,
port: socks_url.port,
username: socks_url.username ? urldecode(socks_url.username) : null,
password: socks_url.password ? urldecode(socks_url.password) : null,
address: url.hostname,
port: url.port,
username: url.username ? urldecode(url.username) : null,
password: url.password ? urldecode(url.password) : null,
socks_version: (match(uri[0], /4/)) ? '4' : '5'
};
@ -207,19 +208,19 @@ function parse_uri(uri) {
/* https://github.com/shadowsocks/shadowsocks-org/commit/78ca46cd6859a4e9475953ed34a2d301454f579e */
/* SIP002 format https://shadowsocks.org/guide/sip002.html */
const ss_url = parseURL('http://' + uri[1]);
url = parseURL('http://' + uri[1]);
let ss_userinfo = {};
if (ss_url.username && ss_url.password)
if (url.username && url.password)
/* User info encoded with URIComponent */
ss_userinfo = [ss_url.username, urldecode(ss_url.password)];
else if (ss_url.username)
ss_userinfo = [url.username, urldecode(url.password)];
else if (url.username)
/* User info encoded with base64 */
ss_userinfo = split(decodeBase64Str(urldecode(ss_url.username)), ':');
ss_userinfo = split(decodeBase64Str(urldecode(url.username)), ':');
let ss_plugin, ss_plugin_opts;
if (ss_url.search && ss_url.searchParams.plugin) {
const ss_plugin_info = split(ss_url.searchParams.plugin, ';');
if (url.search && url.searchParams.plugin) {
const ss_plugin_info = split(url.searchParams.plugin, ';');
ss_plugin = ss_plugin_info[0];
if (ss_plugin === 'simple-obfs')
/* Fix non-standard plugin name */
@ -228,10 +229,10 @@ function parse_uri(uri) {
}
config = {
label: ss_url.hash ? urldecode(ss_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'shadowsocks',
address: ss_url.hostname,
port: ss_url.port,
address: url.hostname,
port: url.port,
shadowsocks_encrypt_method: ss_userinfo[0],
password: ss_userinfo[1],
shadowsocks_plugin: ss_plugin,
@ -246,53 +247,53 @@ function parse_uri(uri) {
return null;
const userinfo = split(uri[0], ':'),
ssr_params = urldecode_params(uri[1]);
params = urldecode_params(uri[1]);
if (!sing_features.with_shadowsocksr) {
log(sprintf('Skipping unsupported %s node: %s.', 'ShadowsocksR', decodeBase64Str(ssr_params.remarks) || userinfo[1]));
log(sprintf('Skipping unsupported %s node: %s.', 'ShadowsocksR', decodeBase64Str(params.remarks) || userinfo[1]));
log(sprintf('Please rebuild sing-box with %s support!', 'ShadowsocksR'));
return null;
}
config = {
label: decodeBase64Str(ssr_params.remarks),
label: decodeBase64Str(params.remarks),
type: 'shadowsocksr',
address: userinfo[0],
port: userinfo[1],
shadowsocksr_encrypt_method: userinfo[3],
password: decodeBase64Str(userinfo[5]),
shadowsocksr_protocol: userinfo[2],
shadowsocksr_protocol_param: decodeBase64Str(ssr_params.protoparam),
shadowsocksr_protocol_param: decodeBase64Str(params.protoparam),
shadowsocksr_obfs: userinfo[4],
shadowsocksr_obfs_param: decodeBase64Str(ssr_params.obfsparam)
shadowsocksr_obfs_param: decodeBase64Str(params.obfsparam)
};
break;
case 'trojan':
/* https://p4gefau1t.github.io/trojan-go/developer/url/ */
const trojan_url = parseURL('http://' + uri[1]),
trojan_params = trojan_url.searchParams || {};
url = parseURL('http://' + uri[1]);
params = url.searchParams || {};
config = {
label: trojan_url.hash ? urldecode(trojan_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'trojan',
address: trojan_url.hostname,
port: trojan_url.port,
password: urldecode(trojan_url.username),
transport: (trojan_params.type !== 'tcp') ? trojan_params.type : null,
address: url.hostname,
port: url.port,
password: urldecode(url.username),
transport: (params.type !== 'tcp') ? params.type : null,
tls: '1',
tls_sni: trojan_params.sni
tls_sni: params.sni
};
switch(trojan_params.type) {
switch(params.type) {
case 'grpc':
config.grpc_servicename = trojan_params.serviceName;
config.grpc_servicename = params.serviceName;
break;
case 'ws':
/* We don't parse "host" param when TLS is enabled, as some providers are abusing it (host vs sni)
* config.ws_host = trojan_params.host ? urldecode(trojan_params.host) : null;
* config.ws_host = params.host ? urldecode(params.host) : null;
*/
config.ws_path = trojan_params.path ? urldecode(trojan_params.path) : null;
config.ws_path = params.path ? urldecode(params.path) : null;
if (config.ws_path && match(config.ws_path, /\?ed=/)) {
config.websocket_early_data_header = 'Sec-WebSocket-Protocol';
config.websocket_early_data = split(config.ws_path, '?ed=')[1];
@ -304,42 +305,42 @@ function parse_uri(uri) {
break;
case 'tuic':
/* https://github.com/daeuniverse/dae/discussions/182 */
const tuic_url = parseURL('http://' + uri[1]),
tuic_params = tuic_url.searchParams || {};
url = parseURL('http://' + uri[1]);
params = url.searchParams || {};
if (!sing_features.with_quic) {
log(sprintf('Skipping unsupported %s node: %s.', 'tuic', urldecode(tuic_url.hash) || tuic_url.hostname));
log(sprintf('Skipping unsupported %s node: %s.', 'tuic', urldecode(url.hash) || url.hostname));
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
return null;
}
config = {
label: tuic_url.hash ? urldecode(tuic_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'tuic',
address: tuic_url.hostname,
port: tuic_url.port,
uuid: tuic_url.username,
password: tuic_url.password ? urldecode(tuic_url.password) : null,
tuic_congestion_control: tuic_params.congestion_control,
tuic_udp_relay_mode: tuic_params.udp_relay_mode,
address: url.hostname,
port: url.port,
uuid: url.username,
password: url.password ? urldecode(url.password) : null,
tuic_congestion_control: params.congestion_control,
tuic_udp_relay_mode: params.udp_relay_mode,
tls: '1',
tls_sni: tuic_params.sni,
tls_alpn: tuic_params.alpn ? split(urldecode(tuic_params.alpn), ',') : null,
tls_sni: params.sni,
tls_alpn: params.alpn ? split(urldecode(params.alpn), ',') : null,
};
break;
case 'vless':
/* https://github.com/XTLS/Xray-core/discussions/716 */
const vless_url = parseURL('http://' + uri[1]),
vless_params = vless_url.searchParams;
url = parseURL('http://' + uri[1]);
params = url.searchParams;
/* Unsupported protocol */
if (vless_params.type === 'kcp') {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(vless_url.hash) || vless_url.hostname));
if (params.type === 'kcp') {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(url.hash) || url.hostname));
return null;
} else if (vless_params.type === 'quic' && (vless_params.quicSecurity && vless_params.quicSecurity !== 'none' || !sing_features.with_quic)) {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(vless_url.hash) || vless_url.hostname));
} else if (params.type === 'quic' && (params.quicSecurity && params.quicSecurity !== 'none' || !sing_features.with_quic)) {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(url.hash) || url.hostname));
if (!sing_features.with_quic)
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
@ -347,36 +348,36 @@ function parse_uri(uri) {
}
config = {
label: vless_url.hash ? urldecode(vless_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'vless',
address: vless_url.hostname,
port: vless_url.port,
uuid: vless_url.username,
transport: (vless_params.type !== 'tcp') ? vless_params.type : null,
tls: (vless_params.security in ['tls', 'xtls', 'reality']) ? '1' : '0',
tls_sni: vless_params.sni,
tls_alpn: vless_params.alpn ? split(urldecode(vless_params.alpn), ',') : null,
tls_reality: (vless_params.security === 'reality') ? '1' : '0',
tls_reality_public_key: vless_params.pbk ? urldecode(vless_params.pbk) : null,
tls_reality_short_id: vless_params.sid,
tls_utls: sing_features.with_utls ? vless_params.fp : null,
vless_flow: (vless_params.security in ['tls', 'reality']) ? vless_params.flow : null
address: url.hostname,
port: url.port,
uuid: url.username,
transport: (params.type !== 'tcp') ? params.type : null,
tls: (params.security in ['tls', 'xtls', 'reality']) ? '1' : '0',
tls_sni: params.sni,
tls_alpn: params.alpn ? split(urldecode(params.alpn), ',') : null,
tls_reality: (params.security === 'reality') ? '1' : '0',
tls_reality_public_key: params.pbk ? urldecode(params.pbk) : null,
tls_reality_short_id: params.sid,
tls_utls: sing_features.with_utls ? params.fp : null,
vless_flow: (params.security in ['tls', 'reality']) ? params.flow : null
};
switch(vless_params.type) {
switch(params.type) {
case 'grpc':
config.grpc_servicename = vless_params.serviceName;
config.grpc_servicename = params.serviceName;
break;
case 'http':
case 'tcp':
if (config.transport === 'http' || vless_params.headerType === 'http') {
config.http_host = vless_params.host ? split(urldecode(vless_params.host), ',') : null;
config.http_path = vless_params.path ? urldecode(vless_params.path) : null;
if (config.transport === 'http' || params.headerType === 'http') {
config.http_host = params.host ? split(urldecode(params.host), ',') : null;
config.http_path = params.path ? urldecode(params.path) : null;
}
break;
case 'ws':
/* We don't parse "host" param when TLS is enabled, as some providers are abusing it (host vs sni) */
config.ws_host = (config.tls !== '1' && vless_params.host) ? urldecode(vless_params.host) : null;
config.ws_path = vless_params.path ? urldecode(vless_params.path) : null;
config.ws_host = (config.tls !== '1' && params.host) ? urldecode(params.host) : null;
config.ws_path = params.path ? urldecode(params.path) : null;
if (config.ws_path && match(config.ws_path, /\?ed=/)) {
config.websocket_early_data_header = 'Sec-WebSocket-Protocol';
config.websocket_early_data = split(config.ws_path, '?ed=')[1];

3
luci-app-homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy
View File

@ -158,7 +158,7 @@ const methods = {
if (fd) {
for (let line = fd.read('line'); length(line); line = fd.read('line')) {
if (match(trim(line), /Environment: (go[0-9\.]+)/))
features['has_mptcp'] = (index(line, 'go1.19') === -1) ? true : false;
features['has_mptcp'] = (index(line, 'go1.20') === -1) ? true : false;
let tags = match(trim(line), /Tags: (.*)/);
if (!tags)
@ -172,6 +172,7 @@ const methods = {
}
features.hp_has_chinadns_ng = access('/usr/bin/chinadns-ng');
features.hp_has_ip_full = access('/usr/libexec/ip-full');
features.hp_has_tproxy = access('/etc/modules.d/nft-tproxy');
features.hp_has_tun = access('/etc/modules.d/30-tun');

4
nftables/Makefile
View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nftables
PKG_VERSION:=1.0.8
PKG_VERSION:=1.0.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
PKG_HASH:=9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50
PKG_HASH:=a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0

4
sing-box/Makefile
View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box
PKG_VERSION:=1.6.0-beta.2
PKG_VERSION:=1.5.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=2b115540c1d7b357b381769cd074c51a47d3ce1845516941a9242ccde4eddc06
PKG_HASH:=3238492e21246b56ef80e99f321c26ffaf9ac8877c916dce85273b61031c58b7
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE