From 611c14bff181fafd8d3db4227b371e423ab60b9d Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 25 Aug 2017 15:40:49 +0800 Subject: luci-app-shadowsocks-libev: display disabled state of remote server Signed-off-by: Yousong Zhou --- .../luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'applications/luci-app-shadowsocks-libev/luasrc/model') diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua index 7ba6b40c53..c0e943574d 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -42,7 +42,8 @@ function values_serverlist(o) local server = sdata["server"] local server_port = sdata["server_port"] if server and server_port then - local desc = "%s - %s:%s" % {sname, sdata["server"], sdata["server_port"]} + local disabled = ucival_to_bool(sdata[".disabled"]) and " - disabled" or "" + local desc = "%s - %s:%s%s" % {sname, server, server_port, disabled} o:value(sname, desc) end end) -- cgit v1.2.3 From 1ad37267ab6e13d780207bd5dd30e19886a0b756 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 4 Jan 2018 14:45:53 +0800 Subject: luci-app-shadowsocks-libev: support option no_delay Signed-off-by: Yousong Zhou --- .../luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'applications/luci-app-shadowsocks-libev/luasrc/model') diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua index c0e943574d..77efe047b4 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -122,6 +122,7 @@ function options_common(s, tab) s:taboption(tab, Flag, "verbose", translate("Verbose")) s:taboption(tab, Flag, "ipv6_first", translate("IPv6 First"), translate("Prefer IPv6 addresses when resolving names")) s:taboption(tab, Flag, "fast_open", translate("Enable TCP Fast Open")) + s:taboption(tab, Flag, "no_delay", translate("Enable TCP_NODELAY")) s:taboption(tab, Flag, "reuse_port", translate("Enable SO_REUSEPORT")) end -- cgit v1.2.3 From f1862ced41f7ff0900cfbb2ed429ad544d5f106c Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 4 Jan 2018 14:38:40 +0800 Subject: luci-app-shadowsocks-libev: remove option manager_address It's an option that is supposed to be fed by ss-manager. It can be in the form of host:port or path to unix dgram socket. Drop it now with the assumption that it has no real user at the moment Signed-off-by: Yousong Zhou --- .../luasrc/model/cbi/shadowsocks-libev/instance-details.lua | 2 -- .../luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua | 1 - 2 files changed, 3 deletions(-) (limited to 'applications/luci-app-shadowsocks-libev/luasrc/model') diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua index 22f3106d03..19f5ddc319 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua @@ -34,8 +34,6 @@ if stype == "ss_server" then o.datatype = "ipaddr" o.placeholder = "0.0.0.0" ss.values_ipaddr(o) - o = s:taboption("general", Value, "manager_address", translate("Manager address")) - o.datatype = "hostport" else ss.options_client(s, "general") if stype == "ss_tunnel" then diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua index 77efe047b4..fc51dcd469 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -139,7 +139,6 @@ function cfgvalue_overview(sdata) cfgvalue_overview_(sdata, lines, names_options_common) cfgvalue_overview_(sdata, lines, { "bind_address", - "manager_address", }) elseif stype == "ss_local" or stype == "ss_redir" or stype == "ss_tunnel" then cfgvalue_overview_(sdata, lines, names_options_client) -- cgit v1.2.3