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

Browse source
This commit is contained in:
Ycarus 2018-12-13 16:46:40 +01:00
parent a862cb0379
commit 209aeaf268
2 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -232,6 +232,7 @@ function wizard_add()
ucic:set("openmptcprouter",server,"get_config","1") ucic:set("openmptcprouter",server,"get_config","1")
ucic:set("openmptcprouter",server,"ip",server_ip) ucic:set("openmptcprouter",server,"ip",server_ip)
ucic:set("openmptcprouter",server,"backup",backup) ucic:set("openmptcprouter",server,"backup",backup)
ucic:set("openmptcprouter",server,"port","65500")
ucic:save("openmptcprouter") ucic:save("openmptcprouter")
if server_ip ~= "" then if server_ip ~= "" then
serversnb = serversnb + 1 serversnb = serversnb + 1
@ -494,13 +495,17 @@ function update_vps()
-- Update VPS -- Update VPS
local update_vps = luci.http.formvalue("flash") or "" local update_vps = luci.http.formvalue("flash") or ""
if update_vps ~= "" then if update_vps ~= "" then
local token = uci:get("openmptcprouter","vps","token") or "" ucic:foreach("openmptcprouter", "server", function(s)
if token ~= "" then local serverip = uci:get("openmptcprouter",s[".name"],"ip")
sys.exec('curl -4 --max-time 20 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. mArray.openmptcprouter["service_addr"] .. ":65500/update") local adminport = uci:get("openmptcprouter",s[".name"],"port") or ""
luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null") local token = uci:get("openmptcprouter",s[".name"],"token") or ""
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status")) if token ~= "" then
return sys.exec('curl -4 --max-time 20 -s -k -H "Authorization: Bearer ' .. token .. '" https://' .. serverip .. ":" .. adminport .. "/update")
end luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null")
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status"))
return
end
end)
end end
end end
@ -640,9 +645,10 @@ function interfaces_status()
ucic:foreach("openmptcprouter", "server", function(s) ucic:foreach("openmptcprouter", "server", function(s)
local serverip = uci:get("openmptcprouter",s[".name"],"ip") local serverip = uci:get("openmptcprouter",s[".name"],"ip")
if serverip ~= "" and (mArray.openmptcprouter["service_addr"] == serverip or serverip == mArray.openmptcprouter["wan_addr"]) then if serverip ~= "" and (mArray.openmptcprouter["service_addr"] == serverip or serverip == mArray.openmptcprouter["wan_addr"]) then
local adminport = uci:get("openmptcprouter",s[".name"],"port") or ""
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 .. ":65500/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 "" local vpsinfo = json.decode(vpsinfo_json) or ""
if vpsinfo.vps ~= nil then if vpsinfo.vps ~= nil then
mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or "" mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or ""
@ -840,18 +846,24 @@ function interfaces_status()
local latency = "" local latency = ""
local server_ping = "" local server_ping = ""
if connectivity ~= "ERROR" and ifname ~= "" and gateway ~= "" and gw_ping ~= "DOWN" and ifname ~= nil and mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then if connectivity ~= "ERROR" and ifname ~= "" and gateway ~= "" and gw_ping ~= "DOWN" and ifname ~= nil and mArray.openmptcprouter["service_addr"] ~= "" then
local server_ping_test = sys.exec("ping -w 1 -c 1 -I " .. ifname .. " " .. mArray.openmptcprouter["service_addr"]) local serverip = mArray.openmptcprouter["service_addr"]
local server_ping_result = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | grep '100% packet loss'")) if serverip == "127.0.0.1" then
if server_ping_result ~= "" then serverip = mArray.openmptcprouter["wan_addr"]
server_ping = "DOWN" end
if connectivity == "OK" then if serverip ~= "" then
connectivity = "WARNING" local server_ping_test = sys.exec("ping -w 1 -c 1 -I " .. ifname .. " " .. mArray.openmptcprouter["service_addr"])
local server_ping_result = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | grep '100% packet loss'"))
if server_ping_result ~= "" then
server_ping = "DOWN"
if connectivity == "OK" then
connectivity = "WARNING"
end
else
mArray.openmptcprouter["vps_status"] = "UP"
server_ping = "UP"
latency = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | cut -d '/' -s -f5 | cut -d '.' -f1"))
end end
else
mArray.openmptcprouter["vps_status"] = "UP"
server_ping = "UP"
latency = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | cut -d '/' -s -f5 | cut -d '.' -f1"))
end end
end end

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

@ -8,7 +8,7 @@
%> %>
<form class="inline" method="post" action="<%=url('admin/system/openmptcprouter/update_vps')%>"> <form class="inline" method="post" action="<%=url('admin/system/openmptcprouter/update_vps')%>">
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Update VPSs%></h2> <h2 name="content"><%:Update VPS%></h2>
<fieldset class="cbi-section" id="update"> <fieldset class="cbi-section" id="update">
<div class="cbi-section-descr"><%:Update remotly OpenMPTCProuter server to latest version when needed.%> <b><%:Beta%></b></div> <div class="cbi-section-descr"><%:Update remotly OpenMPTCProuter server to latest version when needed.%> <b><%:Beta%></b></div>
<div class="cbi-value"> <div class="cbi-value">