mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-13 02:51:50 +00:00
Code Issues Releases Wiki Activity

Use new omrvpn interface

Browse source
This commit is contained in:
Ycarus 2018-06-06 17:56:07 +02:00
parent d0add9b708
commit 59b031ee8e
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -215,16 +215,24 @@ function interfaces_status()
mArray.openmptcprouter["tun_service"] = false mArray.openmptcprouter["tun_service"] = false
if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") then if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") then
mArray.openmptcprouter["tun_service"] = true mArray.openmptcprouter["tun_service"] = true
mArray.openmptcprouter["tun_ip"] = get_ip("glorytun") mArray.openmptcprouter["tun_ip"] = get_ip("omrvpn")
local tunnel_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 10.0.0.1 | grep '100% packet loss'")) local tun_dev = uci:get("network","omrvpn","ifname")
if tundev ~= "" then
local peer = ut.trim(sys.exec("ip -4 r list dev " .. tun_dev .. " | grep kernel | awk '/proto kernel/ {print $1}' | tr -d '\n'"))
if peer ~= "" then
local tunnel_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 " .. peer .. " | grep '100% packet loss'"))
if tunnel_ping_test == "" then if tunnel_ping_test == "" then
mArray.openmptcprouter["tun_state"] = 'UP' mArray.openmptcprouter["tun_state"] = 'UP'
else else
mArray.openmptcprouter["tun_state"] = 'DOWN' mArray.openmptcprouter["tun_state"] = 'DOWN'
end end
else
mArray.openmptcprouter["tun_state"] = 'DOWN'
end
end
end end
-- check Shadowsocks is running
mArray.openmptcprouter["socks_service"] = false mArray.openmptcprouter["socks_service"] = false
if string.find(sys.exec("/usr/bin/pgrep ss-redir"), "%d+") then if string.find(sys.exec("/usr/bin/pgrep ss-redir"), "%d+") then
mArray.openmptcprouter["socks_service"] = true mArray.openmptcprouter["socks_service"] = true
@ -253,6 +261,7 @@ function interfaces_status()
end end
end end
end end
-- Parse mptcp kernel info -- Parse mptcp kernel info
local mptcp = {} local mptcp = {}
local fullmesh = ut.trim(sys.exec("cat /proc/net/mptcp_fullmesh")) local fullmesh = ut.trim(sys.exec("cat /proc/net/mptcp_fullmesh"))

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

@ -105,6 +105,9 @@
if (mArray.openmptcprouter.socks_service == false) if (mArray.openmptcprouter.socks_service == false)
{ {
statusMessage += 'ShadowSocks is not running<br/>'; statusMessage += 'ShadowSocks is not running<br/>';
} else if (mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'ShadowSocks not working<br/>';
} }
if (mArray.openmptcprouter.tun_service == false) if (mArray.openmptcprouter.tun_service == false)
{ {
@ -118,10 +121,6 @@
{ {
statusMessage += 'DNS issue: can\'t resolve hostname<br/>'; statusMessage += 'DNS issue: can\'t resolve hostname<br/>';
} }
if (mArray.openmptcprouter.ss_addr == "")
{
statusMessage += 'ShadowSocks not working<br/>';
}
if(statusMessage !== "") if(statusMessage !== "")
{ {