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

Multipath put wan in error if shadowsocks is used

Browse source
This commit is contained in:
Ycarus 2018-07-31 17:54:25 +02:00
parent 90ebdbd293
commit c5d8941fc4
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,25 +438,22 @@ function interfaces_status()
mArray.openmptcprouter["dns"] = true mArray.openmptcprouter["dns"] = true
end end
mArray.openmptcprouter["ss_addr"] = ""
--mArray.openmptcprouter["ss_addr6"] = ""
mArray.openmptcprouter["wan_addr"] = ""
mArray.openmptcprouter["wan_addr6"] = ""
local tracker_ip = ""
if mArray.openmptcprouter["dns"] == true then if mArray.openmptcprouter["dns"] == true then
-- shadowsocksaddr -- shadowsocksaddr
local tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or "" tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or ""
local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") local tracker_port = uci:get("shadowsocks-libev","tracker","local_port")
if tracker_ip ~= "" then if tracker_ip ~= "" then
mArray.openmptcprouter["ss_addr"] = sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ip.openmptcprouter.com") mArray.openmptcprouter["ss_addr"] = sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ip.openmptcprouter.com")
--mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com") --mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
else
mArray.openmptcprouter["ss_addr"] = ""
--mArray.openmptcprouter["ss_addr6"] = ""
end end
-- wanaddr -- wanaddr
mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com") mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com")
mArray.openmptcprouter["wan_addr6"] = sys.exec("wget -6 -qO- -T 1 http://ipv6.openmptcprouter.com") mArray.openmptcprouter["wan_addr6"] = sys.exec("wget -6 -qO- -T 1 http://ipv6.openmptcprouter.com")
else
mArray.openmptcprouter["ss_addr"] = ""
--mArray.openmptcprouter["ss_addr6"] = ""
mArray.openmptcprouter["wan_addr"] = ""
mArray.openmptcprouter["wan_addr6"] = ""
end end
mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or "" mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or ""
@ -618,7 +615,7 @@ function interfaces_status()
local latency = "" local latency = ""
local server_ping = '' local server_ping = ''
if connectivity ~= "ERROR" and ifname ~= "" and ifname ~= nil and mArray.openmptcprouter["wan_addr"] ~= "" then if connectivity ~= "ERROR" and ifname ~= "" and gateway ~= "" and gw_ping ~= "DOWN" and ifname ~= nil and mArray.openmptcprouter["wan_addr"] ~= "" then
local server_ping_test = sys.exec("ping -W 1 -c 1 -I " .. ifname .. " " .. mArray.openmptcprouter["wan_addr"]) local server_ping_test = sys.exec("ping -W 1 -c 1 -I " .. ifname .. " " .. mArray.openmptcprouter["wan_addr"])
local server_ping_result = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | grep '100% packet loss'")) local server_ping_result = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | grep '100% packet loss'"))
if server_ping_result ~= "" then if server_ping_result ~= "" then
@ -640,6 +637,9 @@ function interfaces_status()
multipath_available = 'OK' multipath_available = 'OK'
else else
multipath_available = 'ERROR' multipath_available = 'ERROR'
if mArray.openmptcprouter["socks_service"] == true and connectivity == "OK" then
connectivity = 'ERROR'
end
end end
else else
multipath_available = 'NO CHECK' multipath_available = 'NO CHECK'
@ -697,6 +697,8 @@ function interfaces_status()
if ifname ~= nil and ifname:match("^tun.*") then if ifname ~= nil and ifname:match("^tun.*") then
table.insert(mArray.tunnels, data); table.insert(mArray.tunnels, data);
elseif ifname ~= nil and ifname:match("^mlvpn.*") then
table.insert(mArray.tunnels, data);
else else
table.insert(mArray.wans, data); table.insert(mArray.wans, data);
end end