From c19e949380ce2ca3d74c49488748a28e98ab258e Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sun, 5 May 2019 16:53:39 +0000 Subject: [PATCH] shadowsocks-libev: add plugin options support Reference: https://github.com/openwrt/packages/issues/8903 Signed-off-by: Yousong Zhou --- net/shadowsocks-libev/Makefile | 2 +- net/shadowsocks-libev/files/shadowsocks-libev.init | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index 3214a3cc5..b1dc6bfe7 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.2.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init index 42ffe9e0d..2f5168177 100644 --- a/net/shadowsocks-libev/files/shadowsocks-libev.init +++ b/net/shadowsocks-libev/files/shadowsocks-libev.init @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common # -# Copyright (C) 2017 Yousong Zhou +# Copyright (C) 2017-2019 Yousong Zhou # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -73,6 +73,8 @@ ss_xxx() { [ -z "$mode" ] || json_add_string mode "$mode" [ -z "$mtu" ] || json_add_int mtu "$mtu" [ -z "$timeout" ] || json_add_int timeout "$timeout" + [ -z "$plugin" ] || json_add_string plugin "$plugin" + [ -z "$plugin_opts" ] || json_add_string plugin_opts "$plugin_opts" [ -z "$user" ] || json_add_string user "$user" json_dump -i >"$confjson" @@ -237,6 +239,8 @@ validate_common_options_() { 'mode:or("tcp_only", "udp_only", "tcp_and_udp"):tcp_only' \ 'mtu:uinteger' \ 'timeout:uinteger' \ + 'plugin:string' \ + 'plugin_opts:string' \ 'user:string' }