shadowsocks-libev: support ss-server option local_{ipv4,ipv6}_address

At the moment ss-server seems to be the only component using these two
options.  It also accepts "local_address" of either ip4 or ip6 address,
but the meaning is different from that of ss-local, ss-tunnel etc.
where it is for listen bind

With this commit, we start deprecation process of uci option
"bind_address".  The name was replaced with "local_addr" in upstream
project commit 5fa98a66 ("Fix #1911") and available as json config
option "local_address".  This upstream change was released in 3.2.0

Link: https://github.com/shadowsocks/shadowsocks-libev/commit/4a42da641b6e0039497998614e84c94205939c24
Link: https://github.com/openwrt/packages/issues/12931
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index d7a6f784458a259da68e05930236fd31c7ca4715..86974110550e4f68062a11d074aa231fb4ca4b39 100644 (file)
--- 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.3.4
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 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.config b/net/shadowsocks-libev/files/shadowsocks-libev.config
index 93768e9711f44035465f1130a173c2cf8fcd6511..1d41127b6ad23bf22ad7b1f3d6ded9fefbb0bbef 100644 (file)
--- a/net/shadowsocks-libev/files/shadowsocks-libev.config
+++ b/net/shadowsocks-libev/files/shadowsocks-libev.config
@@ -58,4 +58,3 @@ config ss_server
        option server_port '9001'
        option password '********'
        option method 'aes-256-cfb'
-       option bind_address '192.168.7.72'

diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init
index 79ec2e8b3acc95f61adc38632838619bff76710c..dc94b952fd681d05cd32102f41d753fd057fad99 100644 (file)
--- a/net/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/net/shadowsocks-libev/files/shadowsocks-libev.init
@@ -72,6 +72,8 @@ ss_xxx() {
        json_add_boolean no_delay "$no_delay"
        [ -z "$local_address" ] || json_add_string local_address "$local_address"
        [ -z "$local_port" ] || json_add_int local_port "$local_port"
+       [ -z "$local_ipv4_address" ] || json_add_string local_ipv4_address "$local_ipv4_address"
+       [ -z "$local_ipv6_address" ] || json_add_string local_ipv6_address "$local_ipv6_address"
        [ -z "$mode" ] || json_add_string mode "$mode"
        [ -z "$mtu" ] || json_add_int mtu "$mtu"
        [ -z "$timeout" ] || json_add_int timeout "$timeout"
@@ -81,7 +83,10 @@ ss_xxx() {
        procd_open_instance "$cfgtype.$cfg"
        procd_set_param command "$bin" -c "$confjson"
        [ "$verbose" = 0 ] || procd_append_param command -v
-       [ -z "$bind_address" ] || procd_append_param command -b "$bind_address"
+       if [ -n "$bind_address" ]; then
+               echo "$cfgtype $cfg: uci option bind_address deprecated, please switch to local_address" >&2
+               procd_append_param command -b "$bind_address"
+       fi
        procd_set_param file "$confjson"
        procd_set_param respawn
        procd_close_instance
@@ -222,7 +227,7 @@ validate_common_server_options_() {
 validate_common_client_options_() {
        validate_common_options_ "$@" \
                'server:uci("shadowsocks-libev", "@server")' \
-               'local_address:host:0.0.0.0' \
+               'local_address:ipaddr:0.0.0.0' \
                'local_port:port'
 }
 
@@ -280,6 +285,9 @@ validate_ss_server_section() {
        validate_common_server_options_ ss_server "$1" \
                validate_common_options_ \
                "$2" \
+               'local_address:ipaddr' \
+               'local_ipv4_address:ip4addr' \
+               'local_ipv6_address:ip6addr' \
                'bind_address:ipaddr'
 }