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

Fix status page info when backup VPS is used

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2023-12-30 08:51:42 +01:00
parent 5427b7a40c
commit c7dc600f82
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
omr-tracker/files/bin/omr-tracker-server
View file

@ -37,6 +37,11 @@ _check_server() {
done
}
_disable_current() {
local serv=$1
config_set $serv current "0"
}
_disable_redir() {
local redir=$1
config_get server $redir server
@ -86,6 +91,8 @@ _check_master() {
set shadowsocks-rust.sss${count}.server=$ip
EOF
if [ "$count" -eq "0" ]; then
config_load openmptcprouter
config_foreach _disable_current server
uci -q batch <<-EOF >/dev/null
set xray.omrout.s_vmess_address=$ip
set xray.omrout.s_vless_address=$ip
@ -225,6 +232,8 @@ _check_backup() {
set shadowsocks-rust.sss${count}.server=$ip
EOF
if [ "$count" -eq "0" ]; then
config_load openmptcprouter
config_foreach _disable_current server
uci -q batch <<-EOF >/dev/null
set xray.omrout.s_vmess_address=$ip
set xray.omrout.s_vless_address=$ip

4
openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
View file

@ -870,9 +870,10 @@ function interfaces_status()
ucic:foreach("openmptcprouter", "server", function(s)
local serverips = uci:get("openmptcprouter",s[".name"],"ip") or { "" }
local master = uci:get("openmptcprouter",s[".name"],"master") or "1"
local current = uci:get("openmptcprouter",s[".name"],"current") or "0"
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
if serverip ~= "" and (current == "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_kernel"] = uci:get("openmptcprouter",s[".name"],"kernel") or ""
mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter",s[".name"],"machine") or ""
@ -980,6 +981,7 @@ function interfaces_status()
else
mArray.openmptcprouter["vps_admin"] = false
mArray.openmptcprouter["vps_admin_error_msg"] = "No token yet available"
uci:set("openmptcprouter",s[".name"],"token_error","1")
end
if mArray.openmptcprouter["vps_admin"] == false then
if mArray.openmptcprouter["service_addr_ip"] ~= "" then