Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1499 from yousong/shadowsocks-libev

Browse source 
shadowsocks-libev: sync with packages repo
This commit is contained in:
Hannu Nyman 2018-01-06 09:33:18 +02:00 committed by GitHub
commit 916595d157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua
View file

@ -34,8 +34,6 @@ if stype == "ss_server" then
o.datatype = "ipaddr" o.datatype = "ipaddr"
o.placeholder = "0.0.0.0" o.placeholder = "0.0.0.0"
ss.values_ipaddr(o) ss.values_ipaddr(o)
o = s:taboption("general", Value, "manager_address", translate("Manager address"))
o.datatype = "hostport"
else else
ss.options_client(s, "general") ss.options_client(s, "general")
if stype == "ss_tunnel" then if stype == "ss_tunnel" then

5
applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
View file

@ -42,7 +42,8 @@ function values_serverlist(o)
local server = sdata["server"] local server = sdata["server"]
local server_port = sdata["server_port"] local server_port = sdata["server_port"]
if server and server_port then 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) o:value(sname, desc)
end end
end) end)
@ -121,6 +122,7 @@ function options_common(s, tab)
s:taboption(tab, Flag, "verbose", translate("Verbose")) 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, "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, "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")) s:taboption(tab, Flag, "reuse_port", translate("Enable SO_REUSEPORT"))
end end
@ -137,7 +139,6 @@ function cfgvalue_overview(sdata)
cfgvalue_overview_(sdata, lines, names_options_common) cfgvalue_overview_(sdata, lines, names_options_common)
cfgvalue_overview_(sdata, lines, { cfgvalue_overview_(sdata, lines, {
"bind_address", "bind_address",
"manager_address",
}) })
elseif stype == "ss_local" or stype == "ss_redir" or stype == "ss_tunnel" then elseif stype == "ss_local" or stype == "ss_redir" or stype == "ss_tunnel" then
cfgvalue_overview_(sdata, lines, names_options_client) cfgvalue_overview_(sdata, lines, names_options_client)