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

No error when there is no error

Browse source
This commit is contained in:
Ycarus 2019-05-23 21:56:44 +02:00
parent 8730af10b9
commit c172b096e3
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -797,6 +797,7 @@ function interfaces_status()
mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or "" mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or ""
mArray.openmptcprouter["vps_admin"] = true mArray.openmptcprouter["vps_admin"] = true
mArray.openmptcprouter["vps_status"] = "UP" mArray.openmptcprouter["vps_status"] = "UP"
mArray.openmptcprouter["vps_admin_error_msg"] = ""
else else
uci:set("openmptcprouter",s[".name"],"admin_error","1") uci:set("openmptcprouter",s[".name"],"admin_error","1")
uci:delete("openmptcprouter",s[".name"],"token") uci:delete("openmptcprouter",s[".name"],"token")
@ -981,7 +982,7 @@ function interfaces_status()
if gateway == "" then if gateway == "" then
gateway = get_gateway(interface) gateway = get_gateway(interface)
end end
if gateway == "" and ifname ~= nil then if gateway == "" and ifname ~= nil and ifname ~= "" then
if fs.access("/sys/class/net/" .. ifname) then if fs.access("/sys/class/net/" .. ifname) then
gateway = ut.trim(sys.exec("ip -4 r list dev " .. ifname .. " | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d '\n'")) gateway = ut.trim(sys.exec("ip -4 r list dev " .. ifname .. " | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d '\n'"))
if gateway == "" then if gateway == "" then
@ -1059,7 +1060,7 @@ function interfaces_status()
-- Detect if WAN get an IPv6 -- Detect if WAN get an IPv6
local ipv6_discover = "NONE" local ipv6_discover = "NONE"
if ifname ~= nil and mArray.openmptcprouter["ipv6"] == "enabled" then if ifname ~= "" and ifname ~= nil and mArray.openmptcprouter["ipv6"] == "enabled" then
local ipv6_result = _ipv6_discover(ifname) local ipv6_result = _ipv6_discover(ifname)
if type(ipv6_result) == "table" and #ipv6_result > 0 then if type(ipv6_result) == "table" and #ipv6_result > 0 then
local ipv6_addr_test local ipv6_addr_test
@ -1092,12 +1093,15 @@ function interfaces_status()
end end
end end
if ifname ~= nil then local mtu = ""
local mtu = ut.trim(sys.exec("cat /sys/class/net/" .. ifname .. "/mtu | tr -d '\n'")) if ifname ~= "" and ifname ~= nil then
if mtu == "" and ifname ~= nil then if fs.access("/sys/class/net/" .. ifname) then
mtu = ut.trim(sys.exec("cat /sys/class/net/" .. ifname .. "/mtu | tr -d '\n'"))
if mtu == "" and interface ~= nil then
mtu = uci:get("openmptcprouter",interface,"mtu") or "" mtu = uci:get("openmptcprouter",interface,"mtu") or ""
end end
end end
end
local data = { local data = {
label = section["label"] or interface, label = section["label"] or interface,