From 8b6e153249edd40adec4bae31ab267f624a50aec Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 26 Apr 2024 11:12:13 +0200 Subject: [PATCH] Fix no data in status page --- openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter index 0ebca549c..0baca3edf 100755 --- a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter +++ b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter @@ -777,7 +777,7 @@ function interfaces_status() mArray.openmptcprouter["latest_version_vps"] = uci:get("openmptcprouter", "latest_versions", "vps") or "" mArray.openmptcprouter["proxy"] = uci:get("openmptcprouter", "settings", "proxy") or "" - mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "sss0", "server") or "" + mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "sss0", "server") or uci:get("shadowsocks-rust", "sss0", "server") or "" if mArray.openmptcprouter["service_addr"] == "" or mArray.openmptcprouter["service_addr"] == "192.168.1.3" then mArray.openmptcprouter["service_addr"] = "" ucic:foreach("openmptcprouter", "server", function(s) @@ -857,9 +857,9 @@ function interfaces_status() -- shadowsocksaddr mArray.openmptcprouter["proxy_addr"] = uci:get("openmptcprouter","omr","detected_ss_ipv4") or "" if mArray.openmptcprouter["proxy_addr"] == "" and mArray.openmptcprouter["service_addr"] ~= "" then - tracker_ip = uci:get("shadowsocks-libev","tracker_sss0","local_address") or "127.0.0.1" + tracker_ip = uci:get("shadowsocks-libev","tracker_sss0","local_address") or uci:get("shadowsocks-rust","tracker_sss0","local_address") or "127.0.0.1" if tracker_ip ~= "" then - local tracker_port = uci:get("shadowsocks-libev","tracker_sss0","local_port") or "1111" + local tracker_port = uci:get("shadowsocks-libev","tracker_sss0","local_port") or uci:get("shadowsocks-rust","tracker_sss0","local_port") or "1111" if mArray.openmptcprouter["external_check"] ~= false then mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website)) if mArray.openmptcprouter["proxy_addr"] == "" then @@ -882,6 +882,7 @@ function interfaces_status() mArray.openmptcprouter["vps_admin_error_msg"] = "Not found" mArray.openmptcprouter["vps_hostname"] = "Server" + mArray.openmptcprouter["vps_kernel"] = "" -- Get VPS info local adminport = "" ucic:foreach("openmptcprouter", "server", function(s)