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 display multipath state

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-07-07 21:47:00 +02:00
parent f8181f687c
commit 1732e66a16
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -990,6 +990,17 @@ function interfaces_status()
connectivity = "ERROR" connectivity = "ERROR"
end end
local current_multipath_state = ut.trim(sys.exec("multipath " .. ifname)) local current_multipath_state = ut.trim(sys.exec("multipath " .. ifname))
if test_current_multipath_state == ifname .. " is deactivated" then
current_multipath_state = "off"
elseif test_current_multipath_state == ifname .. " is in default mode" then
current_multipath_state = "on"
elseif test_current_multipath_state == ifname .. " is in backup mode" then
current_multipath_state = "backup"
elseif test_current_multipath_state == ifname .. " is in handover mode" then
current_multipath_state = "handover"
else
current_multipath_state = ""
end
if ipaddr == "" and ifname ~= nil then if ipaddr == "" and ifname ~= nil then
ipaddr = ut.trim(sys.exec("ip -4 -br addr ls dev " .. ifname .. " | awk -F'[ /]+' '{print $3}' | tr -d '\n'")) ipaddr = ut.trim(sys.exec("ip -4 -br addr ls dev " .. ifname .. " | awk -F'[ /]+' '{print $3}' | tr -d '\n'"))

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

@ -413,7 +413,7 @@
statusMessage += 'Multipath master already defined<br />'; statusMessage += 'Multipath master already defined<br />';
statusMessageClass = "error"; statusMessageClass = "error";
} }
if(multipath !== multipath_state) if(multipath !== multipath_state && multipath !== 'master' && multipath_state !== 'on')
{ {
statusMessage += 'Multipath current state is ' + multipath_state + '<br />'; statusMessage += 'Multipath current state is ' + multipath_state + '<br />';
statusMessageClass = "error"; statusMessageClass = "error";