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 on openmptcprouter

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-07-23 17:45:44 +02:00
parent b634bf6554
commit 97c53417ec
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,7 @@ function wizard_add()
ucic:delete("qos",intf) ucic:delete("qos",intf)
ucic:save("qos") ucic:save("qos")
ucic:commit("qos") ucic:commit("qos")
if defif ~= "" then if defif ~= nil and defif ~= "" then
luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. defif) luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. defif)
end end
luci.sys.call("uci -q commit vnstat") luci.sys.call("uci -q commit vnstat")
@ -498,7 +498,7 @@ function wizard_add()
luci.sys.call("/etc/init.d/shadowsocks restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/shadowsocks restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/mlvpn restart >/dev/null 2>/dev/null") --luci.sys.call("/etc/init.d/mlvpn restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/openvpn restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/openvpn restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/omr-tracker restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/omr-tracker restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null")
@ -1003,6 +1003,7 @@ function interfaces_status()
local connectivity local connectivity
local multipath_state = "" local multipath_state = ""
local current_multipath_state = ""
if ifname ~= "" and ifname ~= nil then if ifname ~= "" and ifname ~= nil then
if fs.access("/sys/class/net/" .. ifname) then if fs.access("/sys/class/net/" .. ifname) then
multipath_state = ut.trim(sys.exec("multipath " .. ifname .. " | grep deactivated")) multipath_state = ut.trim(sys.exec("multipath " .. ifname .. " | grep deactivated"))
@ -1017,23 +1018,25 @@ function interfaces_status()
else else
connectivity = "ERROR" connectivity = "ERROR"
end end
local test_current_multipath_state = ut.trim(sys.exec("multipath " .. ifname)) if ifname ~= "" and ifname ~= nil then
if string.find(test_current_multipath_state,"deactivated") then local test_current_multipath_state = ut.trim(sys.exec("multipath " .. ifname))
current_multipath_state = "off" if string.find(test_current_multipath_state,"deactivated") then
elseif string.find(test_current_multipath_state,"default") then current_multipath_state = "off"
current_multipath_state = "on" elseif string.find(test_current_multipath_state,"default") then
elseif string.find(test_current_multipath_state,"backup") then current_multipath_state = "on"
current_multipath_state = "backup" elseif string.find(test_current_multipath_state,"backup") then
elseif string.find(test_current_multipath_state,"handover") then current_multipath_state = "backup"
current_multipath_state = "handover" elseif string.find(test_current_multipath_state,"handover") then
else current_multipath_state = "handover"
current_multipath_state = "" else
current_multipath_state = ""
end
end end
if ipaddr == "" and ifname ~= nil then if ipaddr == "" and ifname ~= nil and ifname ~= "" 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'"))
end end
if ipaddr == "" and ifname ~= nil then if ipaddr == "" and ifname ~= nil and ifname ~= "" then
ipaddr = ut.trim(sys.exec("ip -4 addr show dev " .. ifname .. " | grep -m 1 inet | awk '{print $2}' | cut -d'/' -s -f1 | tr -d '\n'")) ipaddr = ut.trim(sys.exec("ip -4 addr show dev " .. ifname .. " | grep -m 1 inet | awk '{print $2}' | cut -d'/' -s -f1 | tr -d '\n'"))
end end
if ipaddr == "" then if ipaddr == "" then

9
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -9,6 +9,11 @@ USE_PROCD=1
omr_intf_del() { omr_intf_del() {
uci -q delete openmptcprouter.$1 uci -q delete openmptcprouter.$1
} }
omr_intf_check() {
[ "$(uci -q get network.$1)" = "" ] && omr_intf_del $1
}
omr_intf_set() { omr_intf_set() {
config_get multipath "$1" multipath config_get multipath "$1" multipath
config_get ifname "$1" ifname config_get ifname "$1" ifname
@ -64,8 +69,8 @@ set_ipv6_state() {
start_service() { start_service() {
local scaling_min_freq scaling_max_freq local scaling_min_freq scaling_max_freq
#config_load openmptcprouter config_load openmptcprouter
#config_foreach omr_intf_del interface config_foreach omr_intf_check interface
config_load network config_load network
config_foreach omr_intf_set interface config_foreach omr_intf_set interface