2019-01-04

apps/shadowsocks/config/shadowsocks.uci

@@ -5,5 +5,5 @@ supports="linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf"
 appinfo="最好的翻墙工具，没有之一，还可以加速国内外游戏"
-newinfo="新增smartdns功能"
-version="0.0.4"
+newinfo="修复回国模式的未添加ipset规则的bug"
+version="0.0.5"

apps/shadowsocks/config/version.txt

@@ -1 +0,0 @@
-2.0.1

apps/shadowsocks/scripts/shadowsocks.sh

@@ -349,13 +349,14 @@ ipset_rules() {
 			ipset -! add customize_white ${line} &> /dev/null
 		fi
 	done 
-	echo "server=/.apple.com/$CDN#53" >> ${mbtmp}/wblist.conf
-	echo "ipset=/.apple.com/customize_white" >> ${mbtmp}/wblist.conf
-	echo "server=/.microsoft.com/$CDN#53" >> ${mbtmp}/wblist.conf
-	echo "ipset=/.microsoft.com/customize_white" >> ${mbtmp}/wblist.conf
-	
+	if [ "$ss_mode" != "homemode" ]; then
+		echo "server=/.apple.com/$CDN#53" >> ${mbtmp}/wblist.conf
+		echo "ipset=/.apple.com/customize_white" >> ${mbtmp}/wblist.conf
+		echo "server=/.microsoft.com/$CDN#53" >> ${mbtmp}/wblist.conf
+		echo "ipset=/.microsoft.com/customize_white" >> ${mbtmp}/wblist.conf
+	fi
 	#黑白名单规则
-	if [ "$ss_mode" = "whitelist" -o "$ssg_mode" = "frgame" ]; then
+	if [ "$ss_mode" = "whitelist" -o "$ssg_mode" = "frgame" -o "$ss_mode" = "homemode" ]; then
 		sed -e "s/^/-A nogfwnet &/g" -e "1 i\-N nogfwnet hash:net" ${mbroot}/apps/${appname}/config/chnroute.txt | ipset -R -! 
 	elif [ "$ss_mode" = "gfwlist" -o "$ssg_mode" = "cngame" ]; then
 		cp -rf ${mbroot}/apps/${appname}/config/gfwlist.conf ${mbtmp}/gfwlist.conf