Merge pull request #428 from aa65535/master

luci-app-shadowsocks-libev: update package

applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev.lua

@@ -9,36 +9,6 @@ else
 	m = Map("shadowsocks-libev", translate("ShadowSocks-libev"), translate("ShadowSocks-libev is not running"))
 end
 
--- Global Setting
-s = m:section(TypedSection, "shadowsocks-libev", translate("Global Setting"))
-s.anonymous = true
-
-o = s:option(Flag, "enable", translate("Enable"))
-o.default = 1
-o.rmempty = false
-
-o = s:option(Value, "server", translate("Server Address"))
-o.datatype = "host"
-o.rmempty = false
-
-o = s:option(Value, "server_port", translate("Server Port"))
-o.datatype = "port"
-o.rmempty = false
-
-o = s:option(Value, "local_port", translate("Local Port"))
-o.datatype = "port"
-o.default = 1080
-o.rmempty = false
-
-o = s:option(Value, "timeout", translate("Connection Timeout"))
-o.datatype = "uinteger"
-o.default = 60
-o.rmempty = false
-
-o = s:option(Value, "password", translate("Password"))
-o.password = true
-o.rmempty = false
-
 e = {
 	"table",
 	"rc4",
@@ -59,27 +29,86 @@ e = {
 	"chacha20",
 }
 
+-- Global Setting
+s = m:section(TypedSection, "shadowsocks-libev", translate("Global Setting"))
+s.anonymous = true
+
+o = s:option(Flag, "enable", translate("Enable"))
+o.default = 1
+o.rmempty = false
+
+o = s:option(Value, "server", translate("Server Address"))
+o.datatype = "ipaddr"
+o.rmempty = false
+
+o = s:option(Value, "server_port", translate("Server Port"))
+o.datatype = "port"
+o.rmempty = false
+
+o = s:option(Value, "local_port", translate("Local Port"))
+o.datatype = "port"
+o.default = 1080
+o.rmempty = false
+
+o = s:option(Value, "timeout", translate("Connection Timeout"))
+o.datatype = "uinteger"
+o.default = 60
+o.rmempty = false
+
+o = s:option(Value, "password", translate("Password"))
+o.password = true
+o.rmempty = false
+
 o = s:option(ListValue, "encrypt_method", translate("Encrypt Method"))
 for i,v in ipairs(e) do
 	o:value(v)
 end
 o.rmempty = false
 
--- Proxy Setting
-s = m:section(TypedSection, "shadowsocks-libev", translate("Proxy Setting"))
-s.anonymous = true
-
-o = s:option(ListValue, "udp_relay", translate("Proxy Protocol"))
-o:value("0", translate("TCP only"))
-o:value("1", translate("TCP+UDP"))
-o.default = 1
-o.rmempty = false
-
 o = s:option(Value, "ignore_list", translate("Ignore List"))
 o:value("/dev/null", translate("Disabled"))
 o.default = "/dev/null"
 o.rmempty = false
 
+-- UDP Relay
+s = m:section(TypedSection, "shadowsocks-libev", translate("UDP Relay"))
+s.anonymous = true
+
+o = s:option(ListValue, "udp_mode", translate("Relay Mode"))
+o:value("0", translate("Disabled"))
+o:value("1", translate("Enabled"))
+o:value("2", translate("Custom"))
+o.default = 0
+o.rmempty = false
+
+o = s:option(Value, "udp_server", translate("Server Address"))
+o.datatype = "ipaddr"
+o:depends("udp_mode", 2)
+
+o = s:option(Value, "udp_server_port", translate("Server Port"))
+o.datatype = "port"
+o:depends("udp_mode", 2)
+
+o = s:option(Value, "udp_local_port", translate("Local Port"))
+o.datatype = "port"
+o.default = 1081
+o:depends("udp_mode", 2)
+
+o = s:option(Value, "udp_timeout", translate("Connection Timeout"))
+o.datatype = "uinteger"
+o.default = 60
+o:depends("udp_mode", 2)
+
+o = s:option(Value, "udp_password", translate("Password"))
+o.password = true
+o:depends("udp_mode", 2)
+
+o = s:option(ListValue, "udp_encrypt_method", translate("Encrypt Method"))
+for i,v in ipairs(e) do
+	o:value(v)
+end
+o:depends("udp_mode", 2)
+
 -- UDP Forward
 s = m:section(TypedSection, "shadowsocks-libev", translate("UDP Forward"))
 s.anonymous = true

applications/luci-app-shadowsocks-libev/po/templates/shadowsocks-libev.pot

@@ -16,6 +16,15 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
+msgid "Enabled"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Custom"
+msgstr ""
+
 msgid "Server Address"
 msgstr ""
 
@@ -34,15 +43,15 @@ msgstr ""
 msgid "Encrypt Method"
 msgstr ""
 
-msgid "Proxy Setting"
-msgstr ""
-
-msgid "Proxy Protocol"
-msgstr ""
-
 msgid "Ignore List"
 msgstr ""
 
+msgid "UDP Relay"
+msgstr ""
+
+msgid "Relay Mode"
+msgstr ""
+
 msgid "UDP Forward"
 msgstr ""
 
@@ -55,9 +64,6 @@ msgstr ""
 msgid "Access Control"
 msgstr ""
 
-msgid "Disabled"
-msgstr ""
-
 msgid "Allow listed only"
 msgstr ""
 

applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po

@@ -27,6 +27,15 @@ msgstr "全局设置"
 msgid "Enable"
 msgstr "启用"
 
+msgid "Enabled"
+msgstr "已启用"
+
+msgid "Disabled"
+msgstr "已禁用"
+
+msgid "Custom"
+msgstr "自定义"
+
 msgid "Server Address"
 msgstr "服务器地址"
 
@@ -45,15 +54,15 @@ msgstr "密码"
 msgid "Encrypt Method"
 msgstr "加密方式"
 
-msgid "Proxy Setting"
-msgstr "代理设置"
-
-msgid "Proxy Protocol"
-msgstr "代理协议"
-
 msgid "Ignore List"
 msgstr "忽略列表"
 
+msgid "UDP Relay"
+msgstr "UDP中继"
+
+msgid "Relay Mode"
+msgstr "中继模式"
+
 msgid "UDP Forward"
 msgstr "UDP转发"
 
@@ -66,9 +75,6 @@ msgstr "UDP转发地址"
 msgid "Access Control"
 msgstr "访问控制"
 
-msgid "Disabled"
-msgstr "已禁用"
-
 msgid "Allow listed only"
 msgstr "仅允许列表内"