v4.35.4

cary-sas · Nov 15, 2021 · fe1c785 · fe1c785
1 parent b9f8746
commit fe1c785
Show file tree

Hide file tree

Showing 19 changed files with 1,551 additions and 2,292 deletions.
diff --git a/380_armv5_packge/4.35.4/md5sum.txt b/380_armv5_packge/4.35.4/md5sum.txt
@@ -0,0 +1 @@
+24a62db9ed99be99e3ab78300fb99a10
diff --git a/380_armv5_packge/4.35.4/shadowsocks.tar.gz b/380_armv5_packge/4.35.4/shadowsocks.tar.gz
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.35.3
+4.35.4
diff --git a/shadowsocks/bin/trojan-go b/shadowsocks/bin/trojan-go
diff --git a/shadowsocks/install.sh b/shadowsocks/install.sh
@@ -237,8 +237,8 @@ dbus set softcenter_module_shadowsocks_description="科学上网 for merlin armv
 dbus set softcenter_module_shadowsocks_home_url="Main_Ss_Content.asp"
 
 # 设置v2ray 版本号
-dbus set ss_basic_v2ray_version=4.35.3
-dbus set ss_basic_v2ray_date=20211010
+dbus set ss_basic_v2ray_version=4.35.4
+dbus set ss_basic_v2ray_date=20211115
 
 echo_date 一点点清理工作...
 rm -rf /tmp/shadowsocks* >/dev/null 2>&1

diff --git a/shadowsocks/scripts/ss_online_update.sh b/shadowsocks/scripts/ss_online_update.sh
@@ -1111,7 +1111,7 @@ add_trojan_go_servers(){
 	[ -n "$v2ray_host" ] && dbus set ssconf_basic_v2ray_network_host_$trojangoindex=$v2ray_host
 	[ -n "$v2ray_path" ] && dbus set ssconf_basic_v2ray_network_path_$trojangoindex=$v2ray_path
 	dbus set ssconf_basic_trojan_sni_$trojangoindex="$sni"
-
+	dbus set ssconf_basic_v2ray_mux_enable_$trojangoindex=0
 	dbus set ssconf_basic_ss_kcp_support_$trojangoindex=$ss_kcp_support_tmp
 	dbus set ssconf_basic_ss_udp_support_$trojangoindex=$ss_udp_support_tmp
 	dbus set ssconf_basic_ss_kcp_opts_$trojangoindex=$ss_kcp_opts_tmp

diff --git a/shadowsocks/scripts/ss_proc_status.sh b/shadowsocks/scripts/ss_proc_status.sh
@@ -123,7 +123,7 @@ echo_version(){
 	echo "client_linux_arm5	20181114	kcptun"
 	echo "v2ray			$ss_basic_v2ray_version		$ss_basic_v2ray_date"
 	echo "xray			$ss_basic_xray_version		$ss_basic_xray_date"
-	echo "trojan-go		0.8.2		2021年4月1日编译"
+	echo "trojan-go		0.10.6		2021年9月14日编译"
 	echo -----------------------------------------------------------
 }
 

diff --git a/shadowsocks/scripts/ss_update.sh b/shadowsocks/scripts/ss_update.sh
@@ -79,45 +79,4 @@ update_ss2(){
 	exit
 }
 
-# update_ss2(){
-# 	echo_date 开启SS检查更新：使用备用服务器
-# 	echo_date 检测备用服务器在线版本号...
-# 	ss_basic_version_web2=`curl --connect-timeout 5 -s "$backup_url"/version | sed -n 1p`
-# 	if [ -n "$ss_basic_version_web2" ];then
-# 	echo_date 检测到备用服务器在线版本号：$ss_basic_version_web1
-# 		dbus set ss_basic_version_web=$ss_basic_version_web2
-# 		if [ "$ss_basic_version_local" != "$ss_basic_version_web2" ];then
-# 		echo_date 备用服务器在线版本号："$ss_basic_version_web1" 和本地版本号："$ss_basic_version_local" 不同！
-# 			cd /tmp
-# 			md5_web2=`curl -s "$backup_url"/version | sed -n 2p`
-# 			echo_date 开启下载进程，从备用服务器上下载更新包...
-# 			wget "$backup_url"/shadowsocks.tar.gz
-# 			md5sum_gz=`md5sum /tmp/shadowsocks.tar.gz | sed 's/ /\n/g'| sed -n 1p`
-# 			if [ "$md5sum_gz" != "$md5_web2" ]; then
-# 				echo_date 更新包md5校验不一致！估计是下载的时候除了什么状况，请等待一会儿再试...
-# 				rm -rf /tmp/shadowsocks* >/dev/null 2>&1
-# 				sleep 1
-# 				echo_date 然而只有这一台备用更更新服务器，请尝试离线手动安装...
-# 				sleep 1
-# 				exit
-# 			else
-# 				echo_date 更新包md5校验一致！ 开始安装！...
-# 				install_ss
-# 			fi
-# 		else
-# 			echo_date 备用服务器在线版本号："$ss_basic_version_web1" 和本地版本号："$ss_basic_version_local" 相同！
-# 			sleep 1
-# 			echo_date 那还更新个毛啊，关闭更新进程!
-# 			sleep 1
-# 			exit
-# 		fi
-# 	else
-# 		echo_date 没有检测到备用服务器在线版本号,访问备用服务器可能有问题！
-# 		sleep 1
-# 		echo_date 然而只有这一台备用更更新服务器，请尝试离线手动安装...
-# 		sleep 1
-# 		exit
-# 	fi
-# }
-
 update_ss
diff --git a/shadowsocks/scripts/ss_v2ray.sh b/shadowsocks/scripts/ss_v2ray.sh
@@ -68,51 +68,6 @@ get_latest_version_backup(){
 	exit 1
 }
 
-# get_latest_version_backup(){
-# 	rm -rf /tmp/v2ray_latest_info.txt
-# 	echo_date "检测V2Ray最新版本..."
-# 	curl --connect-timeout 8 -s $url_back/latest.txt > /tmp/v2ray_latest_info.txt
-# 	if [ "$?" == "0" ];then
-# 		if [ -z "`cat /tmp/v2ray_latest_info.txt`" ];then
-# 			echo_date "获取V2Ray最新版本信息失败！退出！"
-# 			echo_date "==================================================================="
-# 			echo XU6J03M6
-# 			exit 1
-# 		fi
-# 		if [ -n "`cat /tmp/v2ray_latest_info.txt|grep "404"`" ];then
-# 			echo_date "获取V2Ray最新版本信息失败！退出！"
-# 			echo_date "==================================================================="
-# 			echo XU6J03M6
-# 			exit 1
-# 		fi
-# 		V2VERSION=`cat /tmp/v2ray_latest_info.txt | sed 's/v//g'`
-# 		echo_date "检测到V2Ray最新版本：v$V2VERSION"
-# 		if [ ! -f "/koolshare/bin/v2ray" -o ! -f "/koolshare/bin/v2ctl" ];then
-# 			echo_date "v2ray安装文件丢失！重新下载！"
-# 			CUR_VER="0"
-# 		else
-# 			CUR_VER=`v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f2 | sed 's/v//g'` || 0
-# 			echo_date "当前已安装V2Ray版本：v$CUR_VER"
-# 		fi
-# 		COMP=`versioncmp $V2VERSION $CUR_VER`
-# 		if [ "$COMP" == "1" ];then
-# 			[ "$CUR_VER" != "0" ] && echo_date "V2Ray已安装版本号低于最新版本，开始更新程序..."
-# 			update_now_backup v$V2VERSION
-# 		else
-# 			V2RAY_LOCAL_VER=`/koolshare/bin/v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f2`
-# 			V2RAY_LOCAL_DATE=`/koolshare/bin/v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f5`
-# 			[ -n "$V2RAY_LOCAL_VER" ] && dbus set ss_basic_v2ray_version="$V2RAY_LOCAL_VER"
-# 			[ -n "$V2RAY_LOCAL_DATE" ] && dbus set ss_basic_v2ray_date="$V2RAY_LOCAL_DATE"
-# 			echo_date "V2Ray已安装版本已经是最新，退出更新程序!"
-# 		fi
-# 	else
-# 		echo_date "获取V2Ray最新版本信息失败！请检查到你的网络！"
-# 		echo_date "==================================================================="
-# 		echo XU6J03M6
-# 		exit 1
-# 	fi
-# }
-
 update_now(){
 	rm -rf /tmp/v2ray
 	mkdir -p /tmp/v2ray && cd /tmp/v2ray
@@ -142,61 +97,13 @@ update_now(){
 	if [ "$md5sum_ok=1" ] && [ "$v2ray_ok=1" ];then
 		check_md5sum
 	else
-		echo_date "使用备用服务器下载..."
-		update_now_backup $1
+		echo_date "下载失败，请检查你的网络！"
+		echo_date "==================================================================="
+		echo XU6J03M6
+		exit 1
 	fi
 }
 
-update_now_backup(){
-	echo_date "下载失败，请检查你的网络！"
-	echo_date "==================================================================="
-	echo XU6J03M6
-	exit 1
-}
-
-# update_now_backup(){
-# 	rm -rf /tmp/v2ray
-# 	mkdir -p /tmp/v2ray && cd /tmp/v2ray
-# 
-# 	echo_date "开始下载校验文件：md5sum.txt"
-# 	wget --no-check-certificate --timeout=20 -qO - $url_back/$1/md5sum.txt > /tmp/v2ray/md5sum.txt
-# 	if [ "$?" != "0" ];then
-# 		echo_date "md5sum.txt下载失败！"
-# 		md5sum_ok=0
-# 	else
-# 		md5sum_ok=1
-# 		echo_date "md5sum.txt下载成功..."
-# 	fi
-# 	
-# 	echo_date "开始下载v2ray程序"
-# 	wget --no-check-certificate --timeout=20 --tries=1 $url_back/$1/v2ray
-# 	if [ "$?" != "0" ];then
-# 		echo_date "v2ray下载失败！"
-# 		v2ray_ok=0
-# 	else
-# 		v2ray_ok=1
-# 		echo_date "v2ray程序下载成功..."
-# 	fi
-# 
-# 	echo_date "开始下载v2ctl程序"
-# 	wget --no-check-certificate --timeout=20 --tries=1 $url_back/$1/v2ctl
-# 	if [ "$?" != "0" ];then
-# 		echo_date "v2ctl下载失败！"
-# 		v2ctl_ok=0
-# 	else
-# 		v2ctl_ok=1
-# 		echo_date "v2ctl程序下载成功..."
-# 	fi
-# 
-# 	if [ "$md5sum_ok=1" ] && [ "$v2ray_ok=1" ] && [ "$v2ctl_ok=1" ];then
-# 		check_md5sum
-# 	else
-# 		echo_date "下载失败，请检查你的网络！"
-# 		echo_date "==================================================================="
-# 		echo XU6J03M6
-# 		exit 1
-# 	fi
-# }
 
 check_md5sum(){
 	cd /tmp/v2ray

diff --git a/shadowsocks/scripts/ss_webtest.sh b/shadowsocks/scripts/ss_webtest.sh
@@ -234,7 +234,7 @@ rm -rf /tmp/tmp_v2ray.json
 					},
 					"mux": {
 					  "enabled": $(get_function_switch $(eval echo \$ssconf_basic_v2ray_mux_enable_$nu)),
-					  "concurrency": $ssconf_basic_v2ray_mux_concurrency
+					  "concurrency": $ss_basic_v2ray_mux_concurrency
 					}
 				  }
 				]
@@ -364,7 +364,7 @@ create_trojango_json(){
 					\"host\":  \"\"
 					}"
 	fi
-
+	[ -z "$(eval echo \$ssconf_basic_v2ray_mux_concurrency_$nu)" ] && local ssconf_basic_v2ray_mux_concurrency=8
 		 #trojan go
 		 # 3335 for nat  
 		cat >"/tmp/tmp_trojango.json" <<-EOF
@@ -399,8 +399,8 @@ create_trojango_json(){
 					"prefer_ipv4": true
 				},
 				"mux": {
-					"enabled": false,
-					"concurrency": 8,
+					"enabled": $(get_function_switch $(eval echo \$ssconf_basic_v2ray_mux_enable_$nu)),
+					"concurrency": $ssconf_basic_v2ray_mux_concurrency,
 					"idle_timeout": 60
 				},
 				"websocket": $ws
@@ -447,8 +447,8 @@ create_trojango_json(){
 					"prefer_ipv4": true
 				},
 				"mux": {
-					"enabled": false,
-					"concurrency": 8,
+					"enabled": $(get_function_switch $(eval echo \$ssconf_basic_v2ray_mux_enable_$nu)),
+					"concurrency": $ssconf_basic_v2ray_mux_concurrency,
 					"idle_timeout": 60
 				},
 				"websocket": $ws

diff --git a/shadowsocks/scripts/ss_xray.sh b/shadowsocks/scripts/ss_xray.sh
@@ -98,18 +98,13 @@ update_now(){
 	if [ "$md5sum_ok=1" ] && [ "$xray_ok=1" ] ;then
 		check_md5sum
 	else
-		echo_date "使用备用服务器下载..."
-		update_now_backup $1
+		echo_date "下载失败，请检查你的网络！"
+		echo_date "==================================================================="
+		echo XU6J03M6
+		exit 1
 	fi
 }
 
-update_now_backup(){
-	echo_date "下载失败，请检查你的网络！"
-	echo_date "==================================================================="
-	echo XU6J03M6
-	exit 1
-}
-
 check_md5sum(){
 	cd /tmp/xray
 	echo_date "校验下载的文件!"