Revert "luci-app-ssr-plus: fix commit bug (...."

This reverts commit 75d6fe83b819879c0aeb245ca5d8a89fd506ef22.

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

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=170
-PKG_RELEASE:=6
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -77,9 +77,6 @@ define Package/$(PKG_NAME)/conffiles
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./root/etc/china_ssr.txt $(1)/etc/china_ssr.txt
-	
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./root/etc/config/shadowsocksr $(1)/etc/config/shadowsocksr
 	$(INSTALL_DATA) ./root/etc/config/*.list $(1)/etc/config/

package/lean/luci-app-ssr-plus/root/etc/config/netflixip.list

@@ -1,15 +1,15 @@
+8.41.4.0/24
 23.246.0.0/18
 37.77.184.0/21
-38.72.126.0/24
 45.57.0.0/17
 64.120.128.0/17
 66.197.128.0/17
 69.53.224.0/19
-103.87.204.0/22
 108.175.32.0/20
 185.2.220.0/22
 185.9.188.0/22
 192.173.64.0/18
 198.38.96.0/19
 198.45.48.0/20
+207.45.72.0/22
 208.75.76.0/22

package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr

@@ -629,8 +629,6 @@ start() {
 		/usr/share/shadowsocksr/gfw2ipset.sh
 
 		if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then
-      ipset -N netflix hash:net 2>/dev/null
-      
 			cat /etc/config/netflix.list | while read line || [ -n "$line" ];
 			do
 				sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf
@@ -639,14 +637,17 @@ start() {
 			awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5555"'\n",$0)}' /etc/config/netflix.list >> /tmp/dnsmasq.ssr/netflix_forward.conf
 
 			ipset add ss_spec_wan_ac $(check_host $(uci_get_by_name $NETFLIX_SERVER server)) 2>/dev/null
+		else
+			awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/config/netflix.list > /tmp/dnsmasq.ssr/netflix_forward.conf
+			awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/config/netflix.list >> /tmp/dnsmasq.ssr/netflix_forward.conf
 
+		fi
+
+		ipset -N netflix hash:net 2>/dev/null
 		cat /etc/config/netflixip.list | while read nip || [ -n "$nip" ];
 		do
 			ipset add netflix $nip 2>/dev/null
 		done
-    else
-      rm -f /tmp/dnsmasq.ssr/netflix_forward.conf
-		fi
 		
 		/etc/init.d/dnsmasq restart >/dev/null 2>&1
 	fi

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

@@ -122,6 +122,8 @@ ipset_r() {
 	
 	if [ "$NETFLIX" == "1" ]; then
 		$IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports 4321
+	else
+		$IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports $local_port
 	fi
 	return $?
 }