mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Rename ss to proxy

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-29 21:09:40 +02:00
parent 22e1001cf9
commit 301eb4c9fc
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -250,16 +250,16 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
var title = String.format("%s (%s)", _('Direct output'), mArray.openmptcprouter.wan_addr6); var title = String.format("%s (%s)", _('Direct output'), mArray.openmptcprouter.wan_addr6);
statusMessageClass = "warning"; statusMessageClass = "warning";
statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png"; statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
} else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN") } else if (mArray.openmptcprouter.proxy_addr != "" && mArray.openmptcprouter.vps_status != "DOWN")
{ {
var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.ss_addr); var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.proxy_addr);
} else if (mArray.openmptcprouter.external_check == false) { } else if (mArray.openmptcprouter.external_check == false) {
var title = String.format("%s ?", mArray.openmptcprouter.vps_hostname); var title = String.format("%s ?", mArray.openmptcprouter.vps_hostname);
} else { } else {
var title = '<%:No output%>'; var title = '<%:No output%>';
statusMessage += '<%:No output%>' + '<br/>'; statusMessage += '<%:No output%>' + '<br/>';
} }
if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true) if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
{ {
statusMessage += '<%:No server IP address, No WAN IP address%>' + '<br/>'; statusMessage += '<%:No server IP address, No WAN IP address%>' + '<br/>';
} }
@ -279,10 +279,10 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
if (mArray.openmptcprouter.vps_status == "DOWN") if (mArray.openmptcprouter.vps_status == "DOWN")
{ {
statusMessage += '<%:Can\'t ping server%>' + '<br/>'; statusMessage += '<%:Can\'t ping server%>' + '<br/>';
} else if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true) } else if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
{ {
statusMessage += '<%:Can\'t get public IP address from ShadowSocks%>' + '<br/>'; statusMessage += '<%:Can\'t get public IP address from ShadowSocks%>' + '<br/>';
} else if (mArray.openmptcprouter.v2ray_enabled == true && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true) } else if (mArray.openmptcprouter.v2ray_enabled == true && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
{ {
statusMessage += '<%:Can\'t get public IP address from V2Ray%>' + '<br/>'; statusMessage += '<%:Can\'t get public IP address from V2Ray%>' + '<br/>';
} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.external_check == true) } else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.external_check == true)

12
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -772,7 +772,7 @@ function interfaces_status()
mArray.openmptcprouter["ipv6"] = "enabled" mArray.openmptcprouter["ipv6"] = "enabled"
end end
mArray.openmptcprouter["ss_addr"] = "" mArray.openmptcprouter["proxy_addr"] = ""
--mArray.openmptcprouter["ss_addr6"] = "" --mArray.openmptcprouter["ss_addr6"] = ""
mArray.openmptcprouter["wan_addr"] = "" mArray.openmptcprouter["wan_addr"] = ""
mArray.openmptcprouter["wan_addr6"] = "" mArray.openmptcprouter["wan_addr6"] = ""
@ -808,15 +808,15 @@ function interfaces_status()
mArray.openmptcprouter["external_check"] = false mArray.openmptcprouter["external_check"] = false
end end
-- shadowsocksaddr -- shadowsocksaddr
mArray.openmptcprouter["ss_addr"] = uci:get("openmptcprouter","omr","detected_ss_ipv4") or "" mArray.openmptcprouter["proxy_addr"] = uci:get("openmptcprouter","omr","detected_ss_ipv4") or ""
if mArray.openmptcprouter["ss_addr"] == "" and mArray.openmptcprouter["service_addr"] ~= "" then if mArray.openmptcprouter["proxy_addr"] == "" and mArray.openmptcprouter["service_addr"] ~= "" then
tracker_ip = uci:get("shadowsocks-libev","tracker_sss0","local_address") or "" tracker_ip = uci:get("shadowsocks-libev","tracker_sss0","local_address") or ""
if tracker_ip ~= "" then if tracker_ip ~= "" then
local tracker_port = uci:get("shadowsocks-libev","tracker_sss0","local_port") local tracker_port = uci:get("shadowsocks-libev","tracker_sss0","local_port")
if mArray.openmptcprouter["external_check"] ~= false then if mArray.openmptcprouter["external_check"] ~= false then
mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website)) mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
if mArray.openmptcprouter["ss_addr"] == "" then if mArray.openmptcprouter["proxy_addr"] == "" then
mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.co")) mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.co"))
end end
--mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com") --mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
end end