v4.34.5

cary-sas · Apr 7, 2021 · 2e49524 · 2e49524
1 parent 4087347
commit 2e49524
Show file tree

Hide file tree

Showing 12 changed files with 437 additions and 129 deletions.
diff --git a/380_armv5_packge/4.34.5/md5sum.txt b/380_armv5_packge/4.34.5/md5sum.txt
@@ -0,0 +1 @@
+336789bb9f1812e0af5dc244233618ad
diff --git a/380_armv5_packge/4.34.5/shadowsocks.tar.gz b/380_armv5_packge/4.34.5/shadowsocks.tar.gz
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.34.4
+4.34.5
diff --git a/shadowsocks/bin/jq b/shadowsocks/bin/jq
diff --git a/shadowsocks/install.sh b/shadowsocks/install.sh
@@ -235,8 +235,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.34.4
-dbus set ss_basic_v2ray_date=20210326
+dbus set ss_basic_v2ray_version=4.34.5
+dbus set ss_basic_v2ray_date=20210407
 
 echo_date 一点点清理工作...
 rm -rf /tmp/shadowsocks* >/dev/null 2>&1

diff --git a/shadowsocks/res/ss-menu.js b/shadowsocks/res/ss-menu.js
@@ -310,7 +310,7 @@ function LoadingSSProgress(seconds) {
 		document.getElementById("loading_block3").innerHTML = "应用负载均衡设置 ..."
 		$("#loading_block2").html("<li><font color='#ffcc00'>请勿刷新本页面，应用负载均衡设置 ...</font></li>");
 	} else if (action == 13) {
-		document.getElementById("loading_block3").innerHTML = "SSR节点订阅 ..."
+		document.getElementById("loading_block3").innerHTML = "Shadowsocks节点订阅 ..."
 		$("#loading_block2").html("<li><font color='#ffcc00'>请勿刷新本页面，正在订阅中 ...</font></li>");
 	} else if (action == 14) {
 		document.getElementById("loading_block3").innerHTML = "socks5代理设置 ..."

diff --git a/shadowsocks/scripts/ss_online_update.sh b/shadowsocks/scripts/ss_online_update.sh
@@ -239,6 +239,7 @@ add_ss_servers(){
 	#初始化
 	encrypt_method=""
 	ss_v2ray_tmp="0"
+	ss_v2ray_plugin_tmp="0"
 	ss_v2ray_opts_tmp=""
 	ss_kcp_support_tmp="0"
 	ss_udp_support_tmp="0"
@@ -291,6 +292,13 @@ get_ss_config(){
 	# link format example
 	# plugin=v2ray;path=/s233;host=yes.herokuapp.com;tls
 
+	#	初始化
+	ss_v2ray_tmp="0"
+	ss_v2ray_plugin_tmp="0"	
+	ss_kcp_support_tmp="0"
+	ss_udp_support_tmp="0"
+
+
 	if [ -n "$(echo -n "$decode_link" | grep "?")" ];then
 		plugin=$(echo "$decode_link" |awk -F'?' '{print $2}')
 		plugin_type=$(echo "$plugin" | tr ';' '\n' | grep 'plugin=' | awk -F'=' '{print $2}')	
@@ -769,7 +777,7 @@ add_trojan_servers(){
 	dbus set ssconf_basic_password_$trojanindex=$password
 	dbus set ssconf_basic_type_$trojanindex="4"
 #	dbus set ssconf_basic_v2ray_protocol_$trojanindex="trojan"
-	[ -n "$sni" ] && dbus set ssconf_basic_trojan_sni_$trojanindex="$sni" || dbus set ssconf_basic_trojan_sni_$trojanindex=""
+	dbus set ssconf_basic_trojan_sni_$trojanindex="$sni"
 	dbus set ssconf_basic_ss_kcp_support_$trojanindex=$ss_kcp_support_tmp
 	dbus set ssconf_basic_ss_udp_support_$trojanindex=$ss_udp_support_tmp
 	dbus set ssconf_basic_ss_kcp_opts_$trojanindex=$ss_kcp_opts_tmp
@@ -1620,6 +1628,7 @@ remove_online(){
 		dbus remove ssconf_basic_v2ray_xray_$remove_nu
 		dbus remove ssconf_basic_weight_$remove_nu
 	done
+	remove_node_gap
 }
 
 case $ss_online_action in