From 3e187c76c5cc79edefb7ca15dc9314e7c40d7fc8 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 10 Aug 2020 19:57:59 +0800 Subject: [PATCH] luci-app-ssr-plus: sync with upstream source --- package/lean/luci-app-ssr-plus/Makefile | 4 ++-- .../luasrc/controller/shadowsocksr.lua | 2 +- .../root/etc/uci-defaults/luci-ssr-plus | 15 ++++++++------- .../luci-app-ssr-plus/root/usr/bin/ssr-switch | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 1572aa4f4b..f5df4d459c 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -43,7 +43,7 @@ PKG_CONFIG_DEPENDS:= \ LUCI_TITLE:=SS/SSR/V2Ray/Trojan/Socks5/Tun LuCI interface LUCI_PKGARCH:=all LUCI_DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua +libuci-lua \ - +microsocks +dns2socks +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +tcpping +resolveip\ + +microsocks +dns2socks +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +tcping +resolveip\ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \ @@ -54,4 +54,4 @@ LUCI_DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsm include $(TOPDIR)/feeds/luci/luci.mk -# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index f0ada633a5..1d19f4df9d 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -49,7 +49,7 @@ function act_ping() socket:close() e.ping = luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % domain) if (e.ping == "") then - e.ping = luci.sys.exec(string.format("echo -n $(tcpping -c 1 -i 1 -p %s %s 2>&1 | grep -o 'ttl=[0-9]* time=[0-9]*.[0-9]' | awk -F '=' '{print$3}') 2>/dev/null",port, domain)) + e.ping = luci.sys.exec(string.format("echo -n $(tcping -q -c 1 -i 1 -t 2 -p %s %s 2>&1 | grep -o 'time=[0-9]*' | awk -F '=' '{print $2}') 2>/dev/null",port, domain)) end if (iret == 0) then luci.sys.call(" ipset del ss_spec_wan_ac " .. domain) diff --git a/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus b/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus index 35aca05fa2..ce58da81e9 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus +++ b/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus @@ -11,13 +11,6 @@ set firewall.shadowsocksr.path=/var/etc/shadowsocksr.include set firewall.shadowsocksr.reload=1 commit firewall EOF -chmod 0755 /etc/init.d/shadowsocksr /usr/bin/ssr-* /usr/share/shadowsocksr/*.sh -chmod 0644 /etc/ssr/* \ -/usr/share/shadowsocksr/*.lua \ -/usr/share/rpcd/acl.d/luci-app-ssr-plus.json \ -/usr/lib/lua/luci/model/cbi/shadowsocksr/*.lua \ -/usr/lib/lua/luci/view/shadowsocksr/*.htm -chmod 0600 /etc/config/shadowsocksr touch /etc/ssr/china_ssr.txt touch /etc/ssr/white.list touch /etc/ssr/black.list @@ -26,5 +19,13 @@ touch /etc/ssr/netflixip.list touch /etc/ssr/ad.conf touch /etc/ssr/gfw_list.conf touch /etc/ssr/deny.list +#chmod 0755 /etc/init.d/shadowsocksr /usr/bin/ssr-* /usr/share/shadowsocksr/*.sh +#chmod 0644 /etc/ssr/* \ +#/usr/share/shadowsocksr/*.lua \ +#/usr/share/rpcd/acl.d/luci-app-ssr-plus.json \ +#/usr/lib/lua/luci/controller/shadowsocksr.lua \ +#/usr/lib/lua/luci/model/cbi/shadowsocksr/*.lua \ +#/usr/lib/lua/luci/view/shadowsocksr/*.htm +#chmod 0600 /etc/config/shadowsocksr rm -rf /tmp/luci-modulecache /tmp/luci-indexcache exit 0 diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch index 28a1ecef29..b4338458c9 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch @@ -81,9 +81,9 @@ test_proxy() { local serverport=$(uci_get_by_name $1 server_port) ipset add ss_spec_wan_ac $servername 2>/dev/null ret1=$? - ret=$(tcpping -c 3 -p $serverport $servername | grep 'loss' | awk -F ',' '{ print $3 }' | awk -F "%" '{ print $1 }' | awk -F "." '{ print $1 }') + ret=$(tcping -q -c 3 -i 1 -t 2 -p $serverport $servername) #echo "$(date "+%Y-%m-%d %H:%M:%S") test_proxy> name: $servername, ret1: $ret1, ret: $ret" >> /tmp/ssrplus.log - if [ -z "$ret" ] || [ "$ret" -gt "50" ]; then + if [ "$ret" -gt "0" ]; then [ "$ret1" == "0" ] && ipset del ss_spec_wan_ac $servername 2>/dev/null return 1 fi