diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-01-06 09:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 09:33:18 +0200 |
| commit | 916595d157ce7a6ed8b0a7ede3a02807c5ab0e81 (patch) | |
| tree | bc87d1e6c0c9a110478b56ecaf2ef418fff01620 /applications/luci-app-shadowsocks-libev | |
| parent | 7fd4f84aa95e81c4b021498f57d8b57c8cc20db5 (diff) | |
| parent | f1862ced41f7ff0900cfbb2ed429ad544d5f106c (diff) | |
Merge pull request #1499 from yousong/shadowsocks-libev
shadowsocks-libev: sync with packages repo
Diffstat (limited to 'applications/luci-app-shadowsocks-libev')
| -rw-r--r-- | applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua | 2 | ||||
| -rw-r--r-- | applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua | 5 |
2 files changed, 3 insertions, 4 deletions
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 7ba6b40c53..fc51dcd469 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) @@ -121,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 @@ -137,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) |