shadowsocks-libev: add remote server ips to dst bypass ipset

To align with old iptables-based ss-rules implementation.

Supersedes openwrt/packages#20239

Link: https://github.com/openwrt/packages/pull/20239
Signed-off-by: Luis Liou <liouluis@gmail.com>
[minor fixup on commit title, version bump, etc.]
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 85b634f0b4f03d057613d45553ca272af877c27e)

diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index b10eb32f7f2d28d6cabacf333b04c850df23ec44..5b9a9944a9385f4e8e2f5123015082fe752cb167 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.5
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 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/ss-rules/set.uc b/net/shadowsocks-libev/files/ss-rules/set.uc
index 38140e7e1eb9587dd6a8e28adefede18403654a0..0decec5f1b7935aaaa7ed639c5fb6208dd6a7e0e 100644 (file)
--- a/net/shadowsocks-libev/files/ss-rules/set.uc
+++ b/net/shadowsocks-libev/files/ss-rules/set.uc
@@ -44,7 +44,7 @@ let set_suffix = {
                str: o_src_checkdst,
        },
        "dst_bypass": {
-               str: o_dst_bypass,
+               str: o_dst_bypass + " " + o_remote_servers,
                file: o_dst_bypass_file,
        },
        "dst_bypass_": {