luci-app-ssr-plus: bump to 180-5

package/lean/luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=180
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 include $(INCLUDE_DIR)/package.mk
 

package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt

@@ -4069,6 +4069,11 @@
 103.153.138.0/23
 103.153.146.0/23
 103.153.160.0/23
+103.154.18.0/23
+103.154.30.0/23
+103.154.32.0/23
+103.154.40.0/23
+103.154.66.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -6117,6 +6122,7 @@
 153.101.0.0/16
 153.118.0.0/15
 154.8.128.0/17
+156.59.0.0/16
 157.0.0.0/16
 157.18.0.0/16
 157.61.0.0/16

package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf

@@ -1820,8 +1820,6 @@ server=/compileheart.com/127.0.0.1#5335
 ipset=/compileheart.com/gfwlist
 server=/compress.to/127.0.0.1#5335
 ipset=/compress.to/gfwlist
-server=/connect.facebook.net/127.0.0.1#5335
-ipset=/connect.facebook.net/gfwlist
 server=/conoha.jp/127.0.0.1#5335
 ipset=/conoha.jp/gfwlist
 server=/contactmagazine.net/127.0.0.1#5335
@@ -2716,6 +2714,8 @@ server=/facebook.hu/127.0.0.1#5335
 ipset=/facebook.hu/gfwlist
 server=/facebook.in/127.0.0.1#5335
 ipset=/facebook.in/gfwlist
+server=/facebook.net/127.0.0.1#5335
+ipset=/facebook.net/gfwlist
 server=/facebook.nl/127.0.0.1#5335
 ipset=/facebook.nl/gfwlist
 server=/facebook.se/127.0.0.1#5335
@@ -3650,6 +3650,8 @@ server=/google.vu/127.0.0.1#5335
 ipset=/google.vu/gfwlist
 server=/google.ws/127.0.0.1#5335
 ipset=/google.ws/gfwlist
+server=/googleanalytics.com/127.0.0.1#5335
+ipset=/googleanalytics.com/gfwlist
 server=/googleapis.com/127.0.0.1#5335
 ipset=/googleapis.com/gfwlist
 server=/googleapps.com/127.0.0.1#5335
@@ -3702,6 +3704,8 @@ server=/googlesile.com/127.0.0.1#5335
 ipset=/googlesile.com/gfwlist
 server=/googlesource.com/127.0.0.1#5335
 ipset=/googlesource.com/gfwlist
+server=/googlesyndication.com/127.0.0.1#5335
+ipset=/googlesyndication.com/gfwlist
 server=/googleusercontent.com/127.0.0.1#5335
 ipset=/googleusercontent.com/gfwlist
 server=/googlevideo.com/127.0.0.1#5335
@@ -4486,6 +4490,8 @@ server=/inmediahk.net/127.0.0.1#5335
 ipset=/inmediahk.net/gfwlist
 server=/innermongolia.org/127.0.0.1#5335
 ipset=/innermongolia.org/gfwlist
+server=/inoreader.com/127.0.0.1#5335
+ipset=/inoreader.com/gfwlist
 server=/inote.tw/127.0.0.1#5335
 ipset=/inote.tw/gfwlist
 server=/insecam.org/127.0.0.1#5335
@@ -5714,6 +5720,8 @@ server=/my.pcloud.com/127.0.0.1#5335
 ipset=/my.pcloud.com/gfwlist
 server=/my03.com/127.0.0.1#5335
 ipset=/my03.com/gfwlist
+server=/myactimes.com/127.0.0.1#5335
+ipset=/myactimes.com/gfwlist
 server=/myanniu.com/127.0.0.1#5335
 ipset=/myanniu.com/gfwlist
 server=/myaudiocast.com/127.0.0.1#5335
@@ -6112,8 +6120,6 @@ server=/nwtca.org/127.0.0.1#5335
 ipset=/nwtca.org/gfwlist
 server=/ny.stgloballink.com/127.0.0.1#5335
 ipset=/ny.stgloballink.com/gfwlist
-server=/ny.visiontimes.com/127.0.0.1#5335
-ipset=/ny.visiontimes.com/gfwlist
 server=/nyaa.eu/127.0.0.1#5335
 ipset=/nyaa.eu/gfwlist
 server=/nyaa.si/127.0.0.1#5335
@@ -7478,6 +7484,8 @@ server=/skyvegas.com/127.0.0.1#5335
 ipset=/skyvegas.com/gfwlist
 server=/skyxvpn.com/127.0.0.1#5335
 ipset=/skyxvpn.com/gfwlist
+server=/sl-reverse.com/127.0.0.1#5335
+ipset=/sl-reverse.com/gfwlist
 server=/slaytizle.com/127.0.0.1#5335
 ipset=/slaytizle.com/gfwlist
 server=/sleazydream.com/127.0.0.1#5335

package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch

@@ -81,9 +81,8 @@ test_proxy() {
 	local serverport=$(uci_get_by_name $1 server_port)
 	ipset add ss_spec_wan_ac $servername 2>/dev/null
 	ret1=$?
-	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 [ "$ret" -gt "0" ]; then
+	tcping -q -c 3 -i 1 -t 2 -p $serverport $servername
+	if [ "$?" -gt "0" ]; then
 		[ "$ret1" == "0" ] && ipset del ss_spec_wan_ac $servername 2>/dev/null
 		return 1
 	fi