mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-12 10:31:51 +00:00
Code Issues Releases Wiki Activity

Update to latest shadowsocks luci and fix base64 size

Browse source
This commit is contained in:
Ycarus 2018-02-18 09:51:16 +01:00
parent 16bcda0723
commit dc4c24b6e0
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,8 +39,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
@ -48,10 +46,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
if obfs_installed then
o = s:taboption("obfuscate", Value, "obfs_host", translate("Host"))

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

@ -43,7 +43,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)
@ -99,7 +100,6 @@ function options_server(s, tab)
o = optfunc(Value, "key", translate("Key (base64 encoding)"))
o.datatype = "base64"
o.password = true
o.size = 12
o = optfunc(Value, "password", translate("Password"))
o.password = true
o.size = 12
@ -123,6 +123,7 @@ function options_common(s, tab)
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, "reuse_port", translate("Enable SO_REUSEPORT"))
s:taboption(tab, Flag, "no_delay", translate("Enable TCP_NODELAY"))
s:taboption(tab, Flag, "mptcp", translate("Enable MPTCP"))
end
@ -148,7 +149,6 @@ function cfgvalue_overview(sdata)
cfgvalue_overview_(sdata, lines, names_options_common)
cfgvalue_overview_(sdata, lines, {
"bind_address",
"manager_address",
})
local installed = nixio.fs.access("/usr/bin/obfs-server")
if installed then
@ -158,8 +158,6 @@ function cfgvalue_overview(sdata)
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)
local installed = nixio.fs.access("/usr/bin/obfs-local")
@ -243,6 +241,7 @@ names_options_common = {
"verbose",
"ipv6_first",
"fast_open",
"no_delay",
"reuse_port",
"mode",
"mtu",