diff options
Diffstat (limited to 'applications/luci-app-shadowsocks-libev')
| -rw-r--r-- | applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua | 6 | ||||
| -rw-r--r-- | applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua | 8 |
2 files changed, 4 insertions, 10 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..195a31f2fd 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 @@ -43,10 +41,6 @@ else translate("Tunnel address"), translate("The address ss-tunnel will forward traffic to")) o.datatype = "hostport" - elseif stype == "ss_redir" then - o = s:taboption("advanced", Flag, "disable_sni", - translate("Disable SNI"), - translate("Disable parsing HTTP/HTTPS payload to find then resolve hostname at remote server")) end end 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..af1a75b6f2 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,14 +139,11 @@ 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) if stype == "ss_tunnel" then cfgvalue_overview_(sdata, lines, {"tunnel_address"}) - elseif stype == "ss_redir" then - cfgvalue_overview_(sdata, lines, {"disable_sni"}) end cfgvalue_overview_(sdata, lines, names_options_common) else @@ -224,6 +223,7 @@ names_options_common = { "verbose", "ipv6_first", "fast_open", + "no_delay", "reuse_port", "mode", "mtu", |