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

Only a warning if ShadowSocks is disabled and fix

Browse source
This commit is contained in:
Ycarus 2018-06-14 06:22:24 +02:00
parent fc5ef2c397
commit 06bc6ac46b
2 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -263,7 +263,7 @@ function get_ip(interface)
end
function get_gateway(interface)
local gateway = nil
local gateway = ""
local dump = nil
dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {})
@ -350,6 +350,12 @@ function interfaces_status()
mArray.openmptcprouter["socks_service"] = true
end
mArray.openmptcprouter["socks_service_enabled"] = true
local ss_server = uci:get("shadowsocks-libev","sss0","disabled") or "0"
if ss_server == "1" then
mArray.openmptcprouter["socks_service_enabled"] = false
end
-- Add DHCP infos by parsing dnsmasq config file
mArray.openmptcprouter.dhcpd = {}
dnsmasq = ut.trim(sys.exec("cat /var/etc/dnsmasq.conf*"))

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

@ -102,12 +102,14 @@
temp += String.format('lan (%s)', mArray.openmptcprouter.local_addr);
}
if (mArray.openmptcprouter.socks_service == false)
{
statusMessage += 'ShadowSocks is not running<br/>';
} else if (mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'ShadowSocks not working<br/>';
if (mArray.openmptcprouter.socks_service_enabled == true) {
if (mArray.openmptcprouter.socks_service == false)
{
statusMessage += 'ShadowSocks is not running<br/>';
} else if (mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'ShadowSocks not working<br/>';
}
}
if (mArray.openmptcprouter.tun_service == false)
{
@ -126,11 +128,20 @@
{
statusMessageClass = "error";
statusIcon = "<%=resource%>/openmptcprouter/images/statusError.png";
} else if (mArray.openmptcprouter.tun_state == "DOWN")
{
statusMessageClass = "warning";
statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
statusMessage += 'Glorytun VPN tunnel DOWN';
} else {
if (mArray.openmptcprouter.socks_service_enabled == false)
{
statusMessage += 'ShadowSocks is DISABLED<br/>';
}
if (mArray.openmptcprouter.tun_state == "DOWN")
{
statusMessage += 'VPN tunnel DOWN<br/>';
}
if (statusMessage !== "")
{
statusMessageClass = "warning";
statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
}
}
temp += getNetworkNodeTemplate(equipmentIcon, statusIcon, title, statusMessageClass,statusMessage,content);
temp += '</a></td>'