diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-08-04 17:33:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-04 17:33:15 +0300 |
commit | d082ed964bc85ad87203d6564394258cb096365a (patch) | |
tree | b8e3d452dd8c6c89952ee4e4f4aa1786ec8b9706 /applications | |
parent | af8e2c6d171a4cf9c1c97b028fbcad0e110f7dbb (diff) | |
parent | 5d916835752f83c53528cada375e3dd57c693483 (diff) |
Merge pull request #1278 from yousong/shadowsocks-libev
luci-app-shadowsocks-libev: support ss_redir disable_sni option
Diffstat (limited to 'applications')
-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 | 2 |
2 files changed, 7 insertions, 1 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 d9a61d0bf7..22f3106d03 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 @@ -24,6 +24,7 @@ s:tab("general", translate("General Settings")) s:tab("advanced", translate("Advanced Settings")) s:taboption("general", Flag, "disabled", translate("Disable")) ss.option_install_package(s, "general") +ss.options_common(s, "advanced") if stype == "ss_server" then ss.options_server(s, "general") @@ -42,8 +43,11 @@ 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 -ss.options_common(s, "advanced") return m 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 b11890f89d..63f7ba3c25 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -132,6 +132,8 @@ 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) else |