Skip to content

Commit 82716bc

Browse files
missing233sqliuchangEternalARKsangyishuje1123vernesong
authored
China IP Route: add bypass overseas (#3970)
* Add bypass overseas for China IP Route * fix(init):fix typo (#3959) * Enable eBPF support. (#3893) * Prerequisits for eBPF settings * Add basic eBPF function support. But firewall rule should be investigated in order to reduce system load. * Disable firewall when using eBPF function. * Fix firewall settings. * chore: add translates * chore: fix error * Update openclash --------- Co-authored-by: sangyishuje1123 <[email protected]> Co-authored-by: vernesong <[email protected]> * Add bypass overseas for China IP Route --------- Co-authored-by: sqliuchang <[email protected]> Co-authored-by: EternalARK <[email protected]> Co-authored-by: sangyishuje1123 <[email protected]> Co-authored-by: vernesong <[email protected]>
1 parent 2c6edf7 commit 82716bc

File tree

6 files changed

+252
-145
lines changed

6 files changed

+252
-145
lines changed

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

+17-7
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ o.description = translate("Only Supported for Rule Mode")..", "..font_red..bold_
256256
o.default = 1
257257

258258
o = s:taboption("traffic_control", Flag, "disable_udp_quic", font_red..bold_on..translate("Disable QUIC")..bold_off..font_off)
259-
o.description = translate("Prevent YouTube and Others To Use QUIC Transmission")..", "..font_red..bold_on..translate("REJECT UDP Traffic(Not Include CN) On Port 443")..bold_off..font_off
259+
o.description = translate("Prevent YouTube and Others To Use QUIC Transmission")..", "..font_red..bold_on..translate("REJECT UDP Traffic(Not Include bypassed regions_Default:CN) On Port 443")..bold_off..font_off
260260
o.default = 1
261261

262262
o = s:taboption("traffic_control", Flag, "skip_proxy_address", translate("Skip Proxy Address"))
@@ -274,13 +274,19 @@ o:depends("en_mode", "redir-host-tun")
274274
o:depends("en_mode", "redir-host-mix")
275275

276276
if op_mode == "redir-host" then
277-
o = s:taboption("traffic_control", Flag, "china_ip_route", translate("China IP Route"))
278-
o.description = translate("Bypass The China Network Flows, Improve Performance")
277+
o = s:taboption("traffic_control", ListValue, "china_ip_route", translate("China IP Route"))
278+
o.description = translate("Bypass Specified Regions Network Flows, Improve Performance")
279279
o.default = 0
280+
o:value("0", translate("Disable"))
281+
o:value("1", translate("Bypass Mainland China"))
282+
o:value("2", translate("Bypass Overseas"))
280283
else
281-
o = s:taboption("traffic_control", Flag, "china_ip_route", translate("China IP Route"))
282-
o.description = translate("Bypass The China Network Flows, Improve Performance, If Inaccessibility on Bypass Gateway, Try to Enable Bypass Gateway Compatible Option, Depend on Dnsmasq")
284+
o = s:taboption("traffic_control", ListValue, "china_ip_route", translate("China IP Route"))
285+
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")
283286
o.default = 0
287+
o:value("0", translate("Disable"))
288+
o:value("1", translate("Bypass Mainland China"))
289+
o:value("2", translate("Bypass Overseas"))
284290
o:depends("enable_redirect_dns", "1")
285291
o:depends("enable_redirect_dns", "0")
286292

@@ -289,6 +295,7 @@ else
289295
o.default = "114.114.114.114"
290296
o.placeholder = translate("114.114.114.114 or 127.0.0.1#5300")
291297
o:depends("china_ip_route", "1")
298+
o:depends("china_ip_route", "2")
292299
end
293300

294301
o = s:taboption("traffic_control", Flag, "intranet_allowed", translate("Only intranet allowed"))
@@ -1190,9 +1197,12 @@ o = s:taboption("ipv6", Flag, "ipv6_dns", translate("IPv6 DNS Resolve"))
11901197
o.description = translate("Enable to Resolve IPv6 DNS Requests")
11911198
o.default = 0
11921199

1193-
o = s:taboption("ipv6", Flag, "china_ip6_route", translate("China IPv6 Route"))
1194-
o.description = translate("Bypass The China Network Flows, Improve Performance")
1200+
o = s:taboption("ipv6", ListValue, "china_ip6_route", translate("China IPv6 Route"))
1201+
o.description = translate("Bypass Specified Regions Network Flows, Improve Performance")
11951202
o.default = 0
1203+
o:value("0", translate("Disable"))
1204+
o:value("1", translate("Bypass Mainland China"))
1205+
o:value("2", translate("Bypass Overseas"))
11961206
o:depends("ipv6_enable", "1")
11971207

11981208
o = s:taboption("ipv6", Value, "local_network6_pass", translate("Local IPv6 Network Bypassed List"))

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

+19-13
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,22 @@ msgid "Select Stack Type For TUN Mode, According To The Running Speed on Your Ma
165165
msgstr "请自行根据运行速度为 TUN 模式选择合适的网络栈"
166166

167167
msgid "China IP Route"
168-
msgstr "实验性：绕过中国大陆 IP"
168+
msgstr "实验性：绕过指定区域 IP"
169169

170170
msgid "China IPv6 Route"
171-
msgstr "实验性：绕过中国大陆 IPv6"
171+
msgstr "实验性：绕过指定区域 IPv6"
172172

173-
msgid "Bypass The China Network Flows, Improve Performance"
174-
msgstr "启用后中国大陆流量将不再经过内核，提升系统性能"
173+
msgid "Bypass Mainland China"
174+
msgstr "绕过中国大陆"
175175

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

179185
msgid "Log Level"
180186
msgstr "日志等级"
@@ -1053,8 +1059,8 @@ msgstr "*禁用 QUIC"
10531059
msgid "Prevent YouTube and Others To Use QUIC Transmission"
10541060
msgstr "防止 YouTube 等使用 QUIC 导致速度不佳"
10551061

1056-
msgid "REJECT UDP Traffic(Not Include CN) On Port 443"
1057-
msgstr "禁用 443 端口 UDP 流量（不包括国内）"
1062+
msgid "REJECT UDP Traffic(Not Include bypassed regions_Default:CN) On Port 443"
1063+
msgstr "禁用 443 端口 UDP 流量（不包括被绕过的指定区域_默认国内）"
10581064

10591065
msgid "Operation Mode"
10601066
msgstr "模式设置"
@@ -3205,13 +3211,13 @@ msgid "Backup Proxy Provider"
32053211
msgstr "仅备份代理集"
32063212

32073213
msgid "Chnroute Bypassed List"
3208-
msgstr "绕过中国大陆 IPv4 黑名单"
3214+
msgstr "绕过指定区域 IPv4 黑名单"
32093215

32103216
msgid "Chnroute6 Bypassed List"
3211-
msgstr "绕过中国大陆 IPv6 黑名单"
3217+
msgstr "绕过指定区域 IPv6 黑名单"
32123218

32133219
msgid "Domains or IPs in The List Will Not be Affected by The China IP Route Option, Depend on Dnsmasq"
3214-
msgstr "列表中的域名或 IP 将不会受到绕过中国大陆 IP 选项的影响，此功能依赖于 Dnsmasq"
3220+
msgstr "列表中的域名或 IP 将不会受到绕过指定区域 IP 选项的影响，此功能依赖于 Dnsmasq"
32153221

32163222
msgid "Warning: You May Need to Turn off The Rebinding Protection Option of Dnsmasq When Hosts Has Set a Reserved Address"
32173223
msgstr "警告：Hosts 设置了保留地址时需要关闭 Dnsmasq 的重绑定保护选项才能生效"
@@ -3279,8 +3285,8 @@ msgstr "警告：检测到 Dnsmasq 工作异常，设置防火墙 DNS 劫持规
32793285
msgid "Tip: Dnsmasq Work is Normal, Restore The Firewall DNS Hijacking Rules..."
32803286
msgstr "提示：检测到 Dnsmasq 正常工作，还原防火墙 DNS 劫持规则..."
32813287

3282-
msgid "Tip: Bypass the China 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..."
3283-
msgstr "提示：在 FAKE-IP 模式下绕过中国 IP 可能会导致 Dnsmasq 加载时间过长，暂时劫持 DNS 至内核直到 Dnsmasq 正常工作..."
3288+
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..."
3289+
msgstr "提示：在 FAKE-IP 模式下绕过指定区域 IP 可能会导致 Dnsmasq 加载时间过长，暂时劫持 DNS 至内核直到 Dnsmasq 正常工作..."
32843290

32853291
msgid "Seconds..."
32863292
msgstr "秒后开始启动..."

0 commit comments

Comments
 (0)