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

Fix no output display

Browse source
This commit is contained in:
Ycarus 2018-12-14 20:49:07 +01:00
parent 3fd021e074
commit 63381adc3f
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -654,16 +654,20 @@ function interfaces_status()
local token = uci:get("openmptcprouter",s[".name"],"token") or "" local token = uci:get("openmptcprouter",s[".name"],"token") or ""
if token ~= "" then if token ~= "" then
local vpsinfo_json = sys.exec('curl -4 --max-time 2 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. serverip .. ':' .. adminport .. '/status') local vpsinfo_json = sys.exec('curl -4 --max-time 2 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. serverip .. ':' .. adminport .. '/status')
local vpsinfo = json.decode(vpsinfo_json) or "" if vpsinfo_json ~= "" and vpsinfo_json ~= nil then
if vpsinfo.vps ~= nil then local status, vpsinfo = pcall(function()
mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or "" return json.decode(vpsinfo_json)
mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or "" end)
mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or "" if status and vpsinfo.vps ~= nil then
else mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or ""
uci:set("openmptcprouter",s[".name"],"admin_error","1") mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or ""
uci:delete("openmptcprouter",s[".name"],"token") mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or ""
uci:save("openmptcprouter",s[".name"]) else
uci:commit("openmptcprouter",s[".name"]) uci:set("openmptcprouter",s[".name"],"admin_error","1")
uci:delete("openmptcprouter",s[".name"],"token")
uci:save("openmptcprouter",s[".name"])
uci:commit("openmptcprouter",s[".name"])
end
end end
end end
end end
@ -940,7 +944,7 @@ function interfaces_status()
whois = uci:get("openmptcprouter",interface,"asn") or "" whois = uci:get("openmptcprouter",interface,"asn") or ""
if whois == "" then if whois == "" then
--whois = ut.trim(sys.exec("whois " .. publicIP .. " | grep -i 'netname' | awk '{print $2}'")) --whois = ut.trim(sys.exec("whois " .. publicIP .. " | grep -i 'netname' | awk '{print $2}'"))
whois = ut.trim(sys.exec("wget -4 -qO- -T 1 'http://api.iptoasn.com/v1/as/ip/" .. publicIP .. "' | jsonfilter -e '@.as_description'")) whois = ut.trim(sys.exec("wget -4 -qO- -T 1 'http://api.iptoasn.com/v1/as/ip/" .. publicIP .. "' | jsonfilter -q -e '@.as_description'"))
end end
end end

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

@ -187,6 +187,9 @@
} else if (mArray.openmptcprouter.wan_addr !== "") } else if (mArray.openmptcprouter.wan_addr !== "")
{ {
var title = String.format("Direct output (%s)", mArray.openmptcprouter.wan_addr); var title = String.format("Direct output (%s)", mArray.openmptcprouter.wan_addr);
} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.service_addr != "" && mArray.openmptcprouter.vps_status !== "DOWN")
{
var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.service_addr);
} else { } else {
var title = "No output"; var title = "No output";
} }
@ -195,9 +198,6 @@
if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.ss_addr == "") if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.ss_addr == "")
{ {
statusMessage += 'No VPS IP address, No WAN IP address<br/>'; statusMessage += 'No VPS IP address, No WAN IP address<br/>';
} else if (mArray.openmptcprouter.wan_addr == "")
{
statusMessage += 'No WAN IP address<br/>';
} }
if (mArray.openmptcprouter.wan_addr !== "" && mArray.openmptcprouter.vps_status == "DOWN") if (mArray.openmptcprouter.wan_addr !== "" && mArray.openmptcprouter.vps_status == "DOWN")
{ {
@ -214,6 +214,9 @@
} else if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_addr == "") } else if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_addr == "")
{ {
statusMessage += 'Can\'t get public IP address from ShadowSocks<br/>'; statusMessage += 'Can\'t get public IP address from ShadowSocks<br/>';
} else if (mArray.openmptcprouter.wan_addr == "")
{
statusMessage += 'No WAN IP address detected in less than 1 second<br/>';
} }
if (mArray.openmptcprouter.vps_mptcp == "0") if (mArray.openmptcprouter.vps_mptcp == "0")
{ {

2
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -99,7 +99,7 @@ end
%> %>
<div class="cbi-section-create"> <div class="cbi-section-create">
<div> <div>
<input type="text" class="cbi-section-create-name" id="cbi.cts.omr-bypass.server." name="add_server_name" data-type="uciname" /> <input type="text" class="cbi-section-create-name" id="cbi.cts.omr-bypass.server." name="add_server_name" data-type="uciname" data-optional="true" />
</div> </div>
<input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" name="add_server" value="<%:Add server%>" /> <input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" name="add_server" value="<%:Add server%>" />
</div> </div>