From c3d2e831d672c7b8407ced73ecef57443855cf18 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 3 Mar 2021 11:31:47 +0100
Subject: [PATCH] Fix name change of shadowsocks tracker

---
 .../luasrc/view/openmptcprouter/settings.htm                  | 4 ++--
 .../root/usr/libexec/rpcd/openmptcprouter                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
index e9d4f52a8..941890008 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
@@ -108,8 +108,8 @@
 		<label class="cbi-value-title"><%:Obfuscating type%></label>
 		<div class="cbi-value-field">
 		    <select class="cbi-input-select" name="obfs_type">
-			<option value="http" <% if luci.model.uci.cursor():get("shadowsocks-libev","tracker","obfs_type") == "http" then %>selected="selected"<% end %>>http</option>
-			<option value="tls" <% if luci.model.uci.cursor():get("shadowsocks-libev","tracker","obfs_type") == "tls" then %>selected="selected"<% end %>>tls</option>
+			<option value="http" <% if luci.model.uci.cursor():get("shadowsocks-libev","tracker_sss0","obfs_type") == "http" then %>selected="selected"<% end %>>http</option>
+			<option value="tls" <% if luci.model.uci.cursor():get("shadowsocks-libev","tracker_sss0","obfs_type") == "tls" then %>selected="selected"<% end %>>tls</option>
 		    </select>
 		</div>
 	    </div>
diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index 0708e3f03..2a31616dc 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -810,9 +810,9 @@ function interfaces_status()
 		-- shadowsocksaddr
 		mArray.openmptcprouter["ss_addr"] = uci:get("openmptcprouter","omr","detected_ss_ipv4") or ""
 		if mArray.openmptcprouter["ss_addr"] == "" and mArray.openmptcprouter["service_addr"] ~= "" then
-			tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or ""
+			tracker_ip = uci:get("shadowsocks-libev","tracker_sss0","local_address") or ""
 			if tracker_ip ~= "" then
-				local tracker_port = uci:get("shadowsocks-libev","tracker","local_port")
+				local tracker_port = uci:get("shadowsocks-libev","tracker_sss0","local_port")
 				if mArray.openmptcprouter["external_check"] ~= false then
 					mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
 					if mArray.openmptcprouter["ss_addr"] == "" then