Merge pull request #1301 from yousong/shadowsocks-libev

luci-app-shadowsocks-libev: minor adaption for ease of use
This commit is contained in:
Hannu Nyman 2017-08-13 19:47:25 +03:00 committed by GitHub
commit 0ee6b1c8f7
2 changed files with 7 additions and 2 deletions

View file

@ -16,8 +16,13 @@ m = Map("shadowsocks-libev",
If the prior check results in action <em>checkdst</em>, packets will continue \ If the prior check results in action <em>checkdst</em>, packets will continue \
to have their destination addresses checked.")) to have their destination addresses checked."))
local sdata = m:get('ss_rules')
if not sdata then
m:set('ss_rules', nil, 'ss_rules')
m:set('ss_rules', 'ss_rules', 'disabled', true)
end
s = m:section(NamedSection, "ss_rules", "ss-rules") s = m:section(NamedSection, "ss_rules", "ss_rules")
s:tab("general", translate("General Settings")) s:tab("general", translate("General Settings"))
s:tab("srcip", translate("Source Settings")) s:tab("srcip", translate("Source Settings"))
s:tab("dstip", translate("Destination Settings")) s:tab("dstip", translate("Destination Settings"))

View file

@ -22,7 +22,7 @@ end
function values_redir(o, xmode) function values_redir(o, xmode)
o.map.uci.foreach("shadowsocks-libev", "ss_redir", function(sdata) o.map.uci.foreach("shadowsocks-libev", "ss_redir", function(sdata)
local sname = sdata[".name"] local sname = sdata[".name"]
local mode = sdata["mode"] local mode = sdata["mode"] or "tcp_only"
if mode and mode:find(xmode) then if mode and mode:find(xmode) then
local desc = "%s - %s" % {sname, mode} local desc = "%s - %s" % {sname, mode}
o:value(sname, desc) o:value(sname, desc)