Skip to content

Commit c3844db

Browse files
vernesongvernesong
committed
chore: use geosite in fake-ip-filter for china ip bypass
1 parent 83eff00 commit c3844db

35 files changed

+124
-65392
lines changed

‎luci-app-openclash/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ define Package/$(PKG_NAME)/postrm
132132
rm -rf ${dnsmasqconfdir}/dnsmasq_openclash_custom_domain.conf >/dev/null 2>&1
133133
rm -rf ${dnsmasqconfdir}/dnsmasq_openclash_chnroute_pass.conf >/dev/null 2>&1
134134
rm -rf ${dnsmasqconfdir}/dnsmasq_openclash_chnroute6_pass.conf >/dev/null 2>&1
135-
rm -rf ${dnsmasqconfdir}/dnsmasq_accelerated-domains.china.conf >/dev/null 2>&1
136135
rm -rf /tmp/dler* >/dev/null 2>&1
137136
rm -rf /tmp/etc/openclash >/dev/null 2>&1
138137
rm -rf /tmp/openclash_edit_file_name >/dev/null 2>&1

‎luci-app-openclash/luasrc/model/cbi/openclash/settings.lua

+6-34
Original file line numberDiff line numberDiff line change
@@ -257,30 +257,12 @@ o:depends("en_mode", "redir-host")
257257
o:depends("en_mode", "redir-host-tun")
258258
o:depends("en_mode", "redir-host-mix")
259259

260-
if op_mode == "redir-host" then
261-
o = s:taboption("traffic_control", ListValue, "china_ip_route", translate("China IP Route"))
262-
o.description = translate("Bypass Specified Regions Network Flows, Improve Performance")
263-
o.default = 0
264-
o:value("0", translate("Disable"))
265-
o:value("1", translate("Bypass Mainland China"))
266-
o:value("2", translate("Bypass Overseas"))
267-
else
268-
o = s:taboption("traffic_control", ListValue, "china_ip_route", translate("China IP Route"))
269-
o.description = translate("Bypass Specified Regions Network Flows, Improve Performance, If Inaccessibility on Bypass Gateway, Try to Enable Bypass Gateway Compatible Option, Depend on Dnsmasq")
270-
o.default = 0
271-
o:value("0", translate("Disable"))
272-
o:value("1", translate("Bypass Mainland China"))
273-
o:value("2", translate("Bypass Overseas"))
274-
o:depends("enable_redirect_dns", "1")
275-
o:depends("enable_redirect_dns", "0")
276-
277-
o = s:taboption("traffic_control", Value, "custom_china_domain_dns_server", translate("Specify CN DNS Server"))
278-
o.description = translate("Specify DNS Server For CN Domain Lists, Only One IP Server Address Support")
279-
o.default = "114.114.114.114"
280-
o.placeholder = translate("114.114.114.114 or 127.0.0.1#5300")
281-
o:depends("china_ip_route", "1")
282-
o:depends("china_ip_route", "2")
283-
end
260+
o = s:taboption("traffic_control", ListValue, "china_ip_route", translate("China IP Route"))
261+
o.description = translate("Bypass Specified Regions Network Flows, Improve Performance, If Inaccessibility on Bypass Gateway, Try to Enable Bypass Gateway Compatible Option")
262+
o.default = 0
263+
o:value("0", translate("Disable"))
264+
o:value("1", translate("Bypass Mainland China"))
265+
o:value("2", translate("Bypass Overseas"))
284266

285267
o = s:taboption("traffic_control", Flag, "intranet_allowed", translate("Only intranet allowed"))
286268
o.description = translate("When Enabled, The Control Panel And The Connection Broker Port Will Not Be Accessible From The Public Network")
@@ -1064,16 +1046,6 @@ o.description = translate("Custom Chnroute6 Lists URL, Click Button Below To Ref
10641046
o:value("https://ispip.clang.cn/all_cn_ipv6.txt", translate("Clang-CN-IPV6")..translate("(Default)"))
10651047
o.default = "https://ispip.clang.cn/all_cn_ipv6.txt"
10661048

1067-
o = s:taboption("chnr_update", Value, "cndomain_custom_url")
1068-
o.title = translate("Custom CN Doamin Lists URL")
1069-
o.rmempty = false
1070-
o.description = translate("Custom CN Doamin Dnsmasq Conf URL, Click Button Below To Refresh After Edit")
1071-
o:value("https://testingcf.jsdelivr.net/gh/felixonmars/dnsmasq-china-list@master/accelerated-domains.china.conf", translate("dnsmasq-china-list-testingcf-jsdelivr")..translate("(Default)"))
1072-
o:value("https://fastly.jsdelivr.net/gh/felixonmars/dnsmasq-china-list@master/accelerated-domains.china.conf", translate("dnsmasq-china-list-fastly-jsdelivr"))
1073-
o:value("https://raw.fastgit.org/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf", translate("dnsmasq-china-list-fastgit"))
1074-
o:value("https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf", translate("dnsmasq-china-list-github"))
1075-
o.default = "https://testingcf.jsdelivr.net/gh/felixonmars/dnsmasq-china-list@master/accelerated-domains.china.conf"
1076-
10771049
o = s:taboption("chnr_update", Button, translate("Chnroute Lists Update"))
10781050
o.title = translate("Update Chnroute Lists")
10791051
o.inputtitle = translate("Check And Update")

‎luci-app-openclash/luasrc/view/openclash/status.htm

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
</td></tr>
177177
<tr><td width="25%"><%:Node Select Backup%></td><td width="25%" align="left" id="_historychecktime"><%:Collecting data...%></td><td width="25%"><%:lhie1 Rule Update%></td><td width="25%" align="left" id="_lhie1"><%:Collecting data...%></td></tr>
178178
<tr><td width="25%"><%:Mainland IP Update%></td><td width="25%" align="left" id="_chnroute"><%:Collecting data...%></td><td width="25%"><%: Mainland IPv6 Update%></td><td width="25%" align="left" id="_chnroutev6"><%:Collecting data...%></td></tr>
179-
<tr><td width="25%"><%:GEOIP Data Update%></td><td width="25%" align="left" id="_ipdb"><%:Collecting data...%></td><td width="25%"><%:GeoSite Data Update%></td><td width="25%" align="left" id="_geosite"><%:Collecting data...%></td></tr>
179+
<tr><td width="25%"><%:GeoIP Data Update%></td><td width="25%" align="left" id="_ipdb"><%:Collecting data...%></td><td width="25%"><%:GeoSite Data Update%></td><td width="25%" align="left" id="_geosite"><%:Collecting data...%></td></tr>
180180
</table>
181181
</fieldset>
182182
<script type="text/javascript">//<![CDATA[

‎luci-app-openclash/po/zh-cn/openclash.zh-cn.po

+5-44
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,8 @@ msgstr "绕过中国大陆"
173173
msgid "Bypass Overseas"
174174
msgstr "海外用户回国模式"
175175

176-
msgid "Bypass Specified Regions Network Flows, Improve Performance"
177-
msgstr "启用后指定区域流量将不再经过内核，提升系统性能"
178-
179-
msgid "Bypass Specified Regions Network Flows, Improve Performance, If Inaccessibility on Bypass Gateway, Try to Enable Bypass Gateway Compatible Option, Depend on Dnsmasq"
180-
msgstr "启用后指定区域流量将不再经过内核，提升系统性能，如旁路由遇到无法访问，请尝试启用旁路由兼容模式，此功能依赖于 Dnsmasq"
176+
msgid "Bypass Specified Regions Network Flows, Improve Performance, If Inaccessibility on Bypass Gateway, Try to Enable Bypass Gateway Compatible Option"
177+
msgstr "启用后指定区域流量将不再经过内核，提升系统性能，如旁路由遇到无法访问，请尝试启用旁路由兼容模式"
181178

182179
msgid "Log Level"
183180
msgstr "日志等级"
@@ -1227,8 +1224,8 @@ msgstr "大陆 IPv6 白名单 更新日期"
12271224
msgid "lhie1 Rule Update"
12281225
msgstr "lhie1 规则更新日期"
12291226

1230-
msgid "GEOIP Data Update"
1231-
msgstr "GEOIP 数据库日期"
1227+
msgid "GeoIP Data Update"
1228+
msgstr "GeoIP 数据库日期"
12321229

12331230
msgid "GeoSite Data Update"
12341231
msgstr "GeoSite 数据库日期"
@@ -1488,9 +1485,6 @@ msgstr "大陆IPv6段更新 URL"
14881485
msgid "Custom Chnroute Lists URL"
14891486
msgstr "大陆IP段更新 URL"
14901487

1491-
msgid "Custom CN Doamin Lists URL"
1492-
msgstr "大陆域名列表文件更新 URL"
1493-
14941488
msgid "Custom GeoIP MMDB URL, Click Button Below To Refresh After Edit"
14951489
msgstr "自定义 GeoIP MMDB 数据库的更新来源，编辑后点击下方按钮生效"
14961490

@@ -1503,9 +1497,6 @@ msgstr "自定义大陆 IP 段的更新来源，编辑后点击下方按钮生
15031497
msgid "Custom Chnroute6 Lists URL, Click Button Below To Refresh After Edit"
15041498
msgstr "自定义大陆 IPv6 段的更新来源，编辑后点击下方按钮生效"
15051499

1506-
msgid "Custom CN Doamin Dnsmasq Conf URL, Click Button Below To Refresh After Edit"
1507-
msgstr "自定义大陆域名列表配置文件（Dnsmasq Conf）的更新来源，编辑后点击下方按钮生效"
1508-
15091500
msgid "(Default)"
15101501
msgstr "(默认)"
15111502

@@ -1764,54 +1755,36 @@ msgstr "开始下载大陆 IP 白名单..."
17641755
msgid "Start Downloading The Chnroute6 Cidr List..."
17651756
msgstr "开始下载大陆 IPv6 白名单..."
17661757

1767-
msgid "Start Downloading The CN Domains List..."
1768-
msgstr "开始下载大陆域名白名单..."
1769-
17701758
msgid "Chnroute Cidr List Download Success, Check Updated..."
17711759
msgstr "大陆 IP 白名单下载成功，检查版本是否更新..."
17721760

17731761
msgid "Chnroute6 Cidr List Download Success, Check Updated..."
17741762
msgstr "大陆 IPv6 白名单下载成功，检查版本是否更新..."
17751763

1776-
msgid "CN Domains List Download Success, Check Updated..."
1777-
msgstr "大陆域名白名单下载成功，检查版本是否更新..."
1778-
17791764
msgid "Chnroute Cidr List Has Been Updated, Starting To Replace The Old Version..."
17801765
msgstr "大陆 IP 白名单有更新，开始替换旧版本..."
17811766

17821767
msgid "Chnroute6 Cidr List Has Been Updated, Starting To Replace The Old Version..."
17831768
msgstr "大陆 IPv6 白名单有更新，开始替换旧版本..."
17841769

1785-
msgid "CN Domains List Has Been Updated, Starting To Replace The Old Version..."
1786-
msgstr "大陆域名白名单有更新，开始替换旧版本..."
1787-
17881770
msgid "Chnroute Cidr List Update Successful!"
17891771
msgstr "大陆 IP 白名单更新成功！"
17901772

17911773
msgid "Chnroute6 Cidr List Update Successful!"
17921774
msgstr "大陆 IPv6 白名单更新成功！"
17931775

1794-
msgid "CN Domains List Update Successful!"
1795-
msgstr "大陆域名白名单更新成功！"
1796-
17971776
msgid "Updated Chnroute Cidr List No Change, Do Nothing..."
17981777
msgstr "大陆 IP 白名单没有更新，停止继续操作..."
17991778

18001779
msgid "Updated Chnroute6 Cidr List No Change, Do Nothing..."
18011780
msgstr "大陆 IPv6 白名单没有更新，停止继续操作..."
18021781

1803-
msgid "Updated CN Domains List No Change, Do Nothing..."
1804-
msgstr "大陆域名白名单没有更新，停止继续操作..."
1805-
18061782
msgid "Chnroute Cidr List Update Error, Please Try Again Later..."
18071783
msgstr "大陆 IP 白名单下载失败，请检查网络或稍后再试..."
18081784

18091785
msgid "Chnroute6 Cidr List Update Error, Please Try Again Later..."
18101786
msgstr "大陆 IPv6 白名单下载失败，请检查网络或稍后再试..."
18111787

1812-
msgid "CN Domains List Update Error, Please Try Again Later..."
1813-
msgstr "大陆域名白名单下载失败，请检查网络或稍后再试..."
1814-
18151788
msgid "Start Downloading GeoSite Database..."
18161789
msgstr "开始下载 GeoSite 数据库..."
18171790

@@ -1977,7 +1950,7 @@ msgstr "提示：检测到 GEOIP Dat 数据库文件不存在，准备开始下
19771950
msgid "Tip: Detected that the Core is not Installed, Ready to Download..."
19781951
msgstr "提示：检测到内核文件不存在，准备开始下载..."
19791952

1980-
msgid "Tip: Detected that the Chnroute Cidr or CN Domains List is not Installed, Ready to Download..."
1953+
msgid "Tip: Detected that the Chnroute Cidr is not Installed, Ready to Download..."
19811954
msgstr "提示：检测到大陆白名单列表不存在，准备开始下载..."
19821955

19831956
msgid "Tip: Detected that the Chnroute Cidr List Format is wrong, Ready to Reformat..."
@@ -3171,18 +3144,6 @@ msgstr "提示：检测到 Firewall4，使用 NFTABLE 规则..."
31713144
msgid "Specify CN DNS Server"
31723145
msgstr "大陆域名 DNS 服务器"
31733146

3174-
msgid "Specify DNS Server For CN Domain Lists, Only One IP Server Address Support"
3175-
msgstr "指定大陆域名的 DNS 服务器，只支持填写一个IP地址"
3176-
3177-
msgid "Warning: Dnsmasq Work is Unnormal, Setting The Firewall DNS Hijacking Rules..."
3178-
msgstr "警告：检测到 Dnsmasq 工作异常，设置防火墙 DNS 劫持规则..."
3179-
3180-
msgid "Tip: Dnsmasq Work is Normal, Restore The Firewall DNS Hijacking Rules..."
3181-
msgstr "提示：检测到 Dnsmasq 正常工作，还原防火墙 DNS 劫持规则..."
3182-
3183-
msgid "Tip: Bypass Specified Regions IP May Cause the Dnsmasq Load For a Long Time After Restart in FAKE-IP Mode, Hijack the DNS to Core Untill the Dnsmasq Works Well..."
3184-
msgstr "提示：在 FAKE-IP 模式下绕过指定区域 IP 可能会导致 Dnsmasq 加载时间过长，暂时劫持 DNS 至内核直到 Dnsmasq 正常工作..."
3185-
31863147
msgid "Seconds..."
31873148
msgstr "秒后开始启动..."
31883149

‎luci-app-openclash/root/etc/config/openclash

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ config openclash 'config'
6565
option geoip_custom_url 'https://testingcf.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat'
6666
option chnr_custom_url 'https://ispip.clang.cn/all_cn.txt'
6767
option chnr6_custom_url 'https://ispip.clang.cn/all_cn_ipv6.txt'
68-
option cndomain_custom_url 'https://testingcf.jsdelivr.net/gh/felixonmars/dnsmasq-china-list@master/accelerated-domains.china.conf'
6968

7069
config dns_servers
7170
option type 'udp'

0 commit comments

Comments
 (0)