From 966d87b79b1b4875f1a1c6f73d8a81a9a358afc4 Mon Sep 17 00:00:00 2001
From: Jian Chang <aa65535@live.com>
Date: Thu, 23 Jul 2015 00:52:27 +0800
Subject: luci-app-shadowsocks-libev: update package

support for shadowsocks-libev v2.2.3

Signed-off-by: Jian Chang <aa65535@live.com>
---
 .../luasrc/model/cbi/shadowsocks-libev.lua         | 91 ++++++++++++++--------
 1 file changed, 60 insertions(+), 31 deletions(-)

(limited to 'applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev.lua')

diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev.lua
index 0b88f5a0fc..76435e2f14 100644
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev.lua
@@ -9,6 +9,26 @@ else
 	m = Map("shadowsocks-libev", translate("ShadowSocks-libev"), translate("ShadowSocks-libev is not running"))
 end
 
+e = {
+	"table",
+	"rc4",
+	"rc4-md5",
+	"aes-128-cfb",
+	"aes-192-cfb",
+	"aes-256-cfb",
+	"bf-cfb",
+	"camellia-128-cfb",
+	"camellia-192-cfb",
+	"camellia-256-cfb",
+	"cast5-cfb",
+	"des-cfb",
+	"idea-cfb",
+	"rc2-cfb",
+	"seed-cfb",
+	"salsa20",
+	"chacha20",
+}
+
 -- Global Setting
 s = m:section(TypedSection, "shadowsocks-libev", translate("Global Setting"))
 s.anonymous = true
@@ -18,7 +38,7 @@ o.default = 1
 o.rmempty = false
 
 o = s:option(Value, "server", translate("Server Address"))
-o.datatype = "host"
+o.datatype = "ipaddr"
 o.rmempty = false
 
 o = s:option(Value, "server_port", translate("Server Port"))
@@ -39,47 +59,56 @@ o = s:option(Value, "password", translate("Password"))
 o.password = true
 o.rmempty = false
 
-e = {
-	"table",
-	"rc4",
-	"rc4-md5",
-	"aes-128-cfb",
-	"aes-192-cfb",
-	"aes-256-cfb",
-	"bf-cfb",
-	"camellia-128-cfb",
-	"camellia-192-cfb",
-	"camellia-256-cfb",
-	"cast5-cfb",
-	"des-cfb",
-	"idea-cfb",
-	"rc2-cfb",
-	"seed-cfb",
-	"salsa20",
-	"chacha20",
-}
-
 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
-- 
cgit v1.2.3