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 for multi IP on server

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-01-22 10:40:57 +01:00
parent 2bd2023254
commit f8f62ee77e
4 changed files with 94 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -447,7 +447,7 @@ function wizard_add()
if openmptcprouter_vps_disabled == "1" then if openmptcprouter_vps_disabled == "1" then
disablednb = disablednb + 1 disablednb = disablednb + 1
end end
if server_ip ~= "" then if server_ip[1] ~= "" then
serversnb = serversnb + 1 serversnb = serversnb + 1
end end
ucic:set("openmptcprouter",server,"server") ucic:set("openmptcprouter",server,"server")

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

@ -57,7 +57,7 @@
<div class="cbi-value"> <div class="cbi-value">
<label class="cbi-value-title" for="server_ip"><%:Server IP%></label> <label class="cbi-value-title" for="server_ip"><%:Server IP%></label>
<div class="cbi-value-field"> <div class="cbi-value-field">
<input name="<%=servername%>.server_ip" id="<%=servername%>.server_ip" placeholder="<%:Server IP%>" class="cbi-input-text" value="<%=uci:get("openmptcprouter",servername,"ip")%>" data-optional="false"> <input name="<%=servername%>.server_ip" id="<%=servername%>.server_ip" placeholder="<%:Server IP%>" class="cbi-input-text" value="<%=uci:get_list("openmptcprouter",servername,"ip")[1]%>" data-optional="false">
<div class="cbi-value-description"> <div class="cbi-value-description">
<%:Server IP will be set for proxy and VPN%> <%:Server IP will be set for proxy and VPN%>
</div> </div>

9
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -547,7 +547,7 @@ end
function get_rootfs() function get_rootfs()
local rootfs = {} local rootfs = {}
rootfs['format'] = ut.trim(sys.exec("mount | awk 'NR==1{print $5}'")) rootfs['format'] = luci.util.trim(sys.exec("mount | awk 'NR==1{print $5}'"))
return rootfs return rootfs
end end
@ -837,9 +837,11 @@ function interfaces_status()
mArray.openmptcprouter["vps_hostname"] = "Server" mArray.openmptcprouter["vps_hostname"] = "Server"
-- Get VPS info -- Get VPS info
ucic:foreach("openmptcprouter", "server", function(s) ucic:foreach("openmptcprouter", "server", function(s)
local serverip = uci:get("openmptcprouter",s[".name"],"ip") or "" local serverips = uci:get("openmptcprouter",s[".name"],"ip") or { "" }
local master = uci:get("openmptcprouter",s[".name"],"master") or "1" local master = uci:get("openmptcprouter",s[".name"],"master") or "1"
if serverip ~= "" and (master == "1" or mArray.openmptcprouter["wan_addr"] == serverip or mArray.openmptcprouter["wan_addr6"] == serverip) then for key, value in pairs(serverips) do
serverip = value
if serverip ~= "" and (master == "1" or mArray.openmptcprouter["wan_addr"] == serverip or mArray.openmptcprouter["wan_addr6"] == serverip) and mArray.openmptcprouter["vps_admin"] == false then
mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter", s[".name"], "omr_version") or "" mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter", s[".name"], "omr_version") or ""
mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter",s[".name"],"kernel") or "" mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter",s[".name"],"kernel") or ""
mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter",s[".name"],"machine") or "" mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter",s[".name"],"machine") or ""
@ -936,6 +938,7 @@ function interfaces_status()
end end
end end
end end
end
end) end)

4
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1030,7 +1030,7 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
fi fi
fi fi
} }
config_list_foreach $1 ip omr_tracebox_mptcp config_list_foreach $1 ip omr_tracebox_mtu
} }
config_load openmptcprouter config_load openmptcprouter
config_foreach traceboxmtutest server config_foreach traceboxmtutest server
@ -1090,7 +1090,7 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
fi fi
fi fi
} }
config_list_foreach $1 ip omr_tracebox_mptcp config_list_foreach $1 ip omr_tracebox_mtu
} }
config_load openmptcprouter config_load openmptcprouter
config_foreach traceboxmtutest server config_foreach traceboxmtutest server