aboutsummaryrefslogtreecommitdiff
path: root/net/shadowsocks-libev/files
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2017-08-29 11:19:02 +0800
committerYousong Zhou <yszhou4tech@gmail.com>2017-08-30 10:13:29 +0800
commitcff4f65d818514c0220056b46df2d0e852f6c46a (patch)
tree8bc0427e052e7ecff7617e5c0388e781ea184cb5 /net/shadowsocks-libev/files
parent105c7c06ed9f4c920bc4d1060d8be685d568a6a6 (diff)
shadowsocks-libev: fix validation of list option
ubox 'list' type is for validating multiple elements separated by tabs/whitespaces in a single value. E.g. The following should not be accepted list src_ip_bypass '1.2.3.4 4.3.2.1' Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'net/shadowsocks-libev/files')
-rw-r--r--net/shadowsocks-libev/files/shadowsocks-libev.init12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init
index 4226600d9..dbd64a707 100644
--- a/net/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/net/shadowsocks-libev/files/shadowsocks-libev.init
@@ -287,18 +287,18 @@ validate_ss_rules_section() {
'disabled:bool:0' \
'redir_tcp:uci("shadowsocks-libev", "@ss_redir")' \
'redir_udp:uci("shadowsocks-libev", "@ss_redir")' \
- 'src_ips_bypass:list(or(ip4addr,cidr4))' \
- 'src_ips_forward:list(or(ip4addr,cidr4))' \
- 'src_ips_checkdst:list(or(ip4addr,cidr4))' \
+ 'src_ips_bypass:or(ip4addr,cidr4)' \
+ 'src_ips_forward:or(ip4addr,cidr4)' \
+ 'src_ips_checkdst:or(ip4addr,cidr4)' \
'dst_ips_bypass_file:file' \
- 'dst_ips_bypass:list(or(ip4addr,cidr4))' \
+ 'dst_ips_bypass:or(ip4addr,cidr4)' \
'dst_ips_forward_file:file' \
- 'dst_ips_forward:list(or(ip4addr,cidr4))' \
+ 'dst_ips_forward:or(ip4addr,cidr4)' \
'src_default:or("bypass", "forward", "checkdst"):checkdst' \
'dst_default:or("bypass", "forward"):bypass' \
'local_default:or("bypass", "forward", "checkdst"):bypass' \
'dst_forward_recentrst:bool:0' \
- 'ifnames:list(maxlength(15))' \
+ 'ifnames:maxlength(15)' \
'ipt_args:string'
}