From b50edecc8320c2cd984efb488ac66b31b7fca850 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 20 Oct 2018 18:19:02 +0800 Subject: [PATCH] tune ssr plus gfwlist function --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua | 2 +- package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 76c109101..193ab13c9 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for SSR Plus LUCI_DEPENDS:=+shadowsocksr-libev +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget LUCI_PKGARCH:=all PKG_VERSION:=1 -PKG_RELEASE:=21 +PKG_RELEASE:=22 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua index 5fdfdb775..f0625b604 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua @@ -14,7 +14,7 @@ function f.handle(self, state, data) if state == FORM_VALID then if data.conf then fs.writefile(conffile, data.conf:gsub("\r\n", "\n")) - luci.sys.call("/usr/share/shadowsocksr/gfw2ipset.sh && /etc/init.d/shadowsocksr restart") + luci.sys.call("/usr/share/shadowsocksr/gfw2ipset.sh && /etc/init.d/dnsmasq restart") end end return true diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules index ddf251e6c..0e24a18b1 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -87,8 +87,6 @@ EOF ipset -N fplan hash:net 2>/dev/null for ip in $LAN_FP_IP; do ipset add fplan $ip ; done $IPT -I SS_SPEC_WAN_AC -m set --match-set fplan src -j SS_SPEC_WAN_FW - - $IPT -I SS_SPEC_WAN_AC -d $server -j RETURN fi return $?