v4.36.9

cary-sas · Dec 31, 2022 · cd11587 · cd11587
1 parent da6d039
commit cd11587
Show file tree

Hide file tree

Showing 23 changed files with 1,216 additions and 1,173 deletions.
diff --git a/380_armv5/trojan-go/latest.txt b/380_armv5/trojan-go/latest.txt
diff --git a/380_armv5/trojan-go/v0.10.10/md5sum.txt b/380_armv5/trojan-go/v0.10.10/md5sum.txt
@@ -1 +1 @@
-a1c3c1b597629ed8e68b6d3a8e49eeff  trojan-go
+db85c1f3868cb4aca36579582afa487f  trojan-go
diff --git a/380_armv5/trojan-go/v0.10.10/trojan-go b/380_armv5/trojan-go/v0.10.10/trojan-go
diff --git a/380_armv5/trojan-go/v0.10.6/md5sum.txt b/380_armv5/trojan-go/v0.10.6/md5sum.txt
@@ -0,0 +1 @@
+7a25cd307b9f85721be611a22802509b  trojan-go
diff --git a/380_armv5/trojan-go/v0.10.6/trojan-go b/380_armv5/trojan-go/v0.10.6/trojan-go
diff --git a/380_armv5/trojan-go/v0.10.9/trojan-go b/380_armv5/trojan-go/v0.10.9/trojan-go
diff --git a/380_armv5_packge/4.36.9/md5sum.txt b/380_armv5_packge/4.36.9/md5sum.txt
@@ -0,0 +1 @@
+6bf3c531178e03d5cb6d88860d0ae3f3
diff --git a/380_armv5_packge/4.36.9/shadowsocks.tar.gz b/380_armv5_packge/4.36.9/shadowsocks.tar.gz
diff --git a/380_armv5_packge/config.json.js b/380_armv5_packge/config.json.js
@@ -1,9 +1,9 @@
 {
-"build_date":"2022-12-12_22:11:46",
+"build_date":"2022-12-31_16:31:31",
 "description":"科学上网",
 "home_url":"Main_Ss_Content.asp",
-"md5":"fdc70591e739a101442120a193f14771",
+"md5":"6bf3c531178e03d5cb6d88860d0ae3f3",
 "name":"shadowsocks",
-"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.8/shadowsocks.tar.gz",
-"version":"4.36.8"
+"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.9/shadowsocks.tar.gz",
+"version":"4.36.9"
 }
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.36.8
+4.36.9
diff --git a/shadowsocks/bin/smartdns b/shadowsocks/bin/smartdns
diff --git a/shadowsocks/bin/trojan-go b/shadowsocks/bin/trojan-go
diff --git a/shadowsocks/bin/v2ray b/shadowsocks/bin/v2ray
diff --git a/shadowsocks/scripts/ss_online_update.sh b/shadowsocks/scripts/ss_online_update.sh
@@ -1120,7 +1120,7 @@ get_trojan_go_config(){
 	v2ray_host=$(echo "$decode_link" | tr '?&#' '\n' | grep 'host=' | awk -F'=' '{print $2}')
 	sni=$(echo "$decode_link" | tr '?&#' '\n' | grep 'sni=' | awk -F'=' '{print $2}')
 	binary="Trojan-Go"
-
+	fingerprint="none"
 	#20201024---
 	ss_kcp_support_tmp="0"
 	ss_udp_support_tmp="0"
@@ -1172,6 +1172,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_fingerprint_$trojangoindex="$fingerprint"
 	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
@@ -1312,6 +1313,7 @@ del_none_exist(){
 					dbus remove ssconf_basic_trojan_binary_$localindex	
 					dbus remove ssconf_basic_trojan_network_$localindex
 					dbus remove ssconf_basic_trojan_sni_$localindex
+					dbus remove ssconf_basic_fingerprint_$localindex
 					dbus remove ssconf_basic_type_$localindex
 					dbus remove ssconf_basic_use_kcp_$localindex
 					dbus remove ssconf_basic_use_lb_$localindex
@@ -1411,6 +1413,7 @@ remove_node_gap(){
 				[ -n "$(dbus get ssconf_basic_trojan_binary_$nu)" ] && dbus set ssconf_basic_trojan_binary_"$y"="$(dbus get ssconf_basic_trojan_binary_$nu)" && dbus remove ssconf_basic_trojan_binary_$nu
 				[ -n "$(dbus get ssconf_basic_trojan_network_$nu)" ] && dbus set ssconf_basic_trojan_network_"$y"="$(dbus get ssconf_basic_trojan_network_$nu)" && dbus remove ssconf_basic_trojan_network_$nu
 				[ -n "$(dbus get ssconf_basic_trojan_sni_$nu)" ] && dbus set ssconf_basic_trojan_sni_"$y"="$(dbus get ssconf_basic_trojan_sni_$nu)" && dbus remove ssconf_basic_trojan_sni_$nu
+				[ -n "$(dbus get ssconf_basic_fingerprint_$nu)" ] && dbus set ssconf_basic_fingerprint_"$y"="$(dbus get ssconf_basic_fingerprint_$nu)" && dbus remove ssconf_basic_fingerprint_$nu
 				[ -n "$(dbus get ssconf_basic_type_$nu)" ] && dbus set ssconf_basic_type_"$y"="$(dbus get ssconf_basic_type_$nu)" && dbus remove ssconf_basic_type_$nu
 				[ -n "$(dbus get ssconf_basic_v2ray_protocol_$nu)" ] && dbus set ssconf_basic_v2ray_protocol_"$y"="$(dbus get ssconf_basic_v2ray_protocol_$nu)" && dbus remove ssconf_basic_v2ray_protocol_$nu
 				[ -n "$(dbus get ssconf_basic_v2ray_xray_$nu)" ] && dbus set ssconf_basic_v2ray_xray_"$y"="$(dbus get ssconf_basic_v2ray_xray_$nu)" && dbus remove ssconf_basic_v2ray_xray_$nu
@@ -1729,6 +1732,7 @@ start_update(){
 						dbus remove ssconf_basic_trojan_binary_$conf_nu
 						dbus remove ssconf_basic_trojan_network_$conf_nu
 						dbus remove ssconf_basic_trojan_sni_$conf_nu
+						dbus remove ssconf_basic_fingerprint_$conf_nu
 						dbus remove ssconf_basic_type_$conf_nu
 						dbus remove ssconf_basic_use_kcp_$conf_nu
 						dbus remove ssconf_basic_use_lb_$conf_nu
@@ -1887,6 +1891,7 @@ remove_online(){
 		dbus remove ssconf_basic_trojan_binary_$remove_nu
 		dbus remove ssconf_basic_trojan_network_$remove_nu
 		dbus remove ssconf_basic_trojan_sni_$remove_nu
+		dbus remove ssconf_basic_fingerprint_$remove_nu
 		dbus remove ssconf_basic_type_$remove_nu
 		dbus remove ssconf_basic_use_kcp_$remove_nu
 		dbus remove ssconf_basic_use_lb_$remove_nu

diff --git a/shadowsocks/scripts/ss_proc_status.sh b/shadowsocks/scripts/ss_proc_status.sh
@@ -100,6 +100,17 @@ echo_version(){
 		fi
 	fi
 
+ 	##---------------------------trojan-go-----------------------
+	if [ -z "$ss_basic_trojango_version" ];then
+		ss_basic_trojango_version_tmp=`/koolshare/bin/trojan-go -version 2>/dev/null | head -n 1 | cut -d " " -f2`
+		if [ -n "$ss_basic_trojango_version_tmp" ];then
+			ss_basic_trojango_version="$ss_basic_trojango_version_tmp"
+			dbus set ss_basic_trojango_version="$ss_basic_trojango_version_tmp"
+		else
+			ss_basic_trojango_version="null"
+		fi
+	fi
+
 	echo ① 程序版本（插件版本：$SOFVERSION）：
 	echo -----------------------------------------------------------
 	echo "程序			版本		备注"
@@ -119,7 +130,7 @@ echo_version(){
 	echo "client_linux_arm5	20210922	kcptun"
 	echo "v2ray			$ss_basic_v2ray_version	"	
 	echo "xray			$ss_basic_xray_version	"	
-	echo "trojan-go		0.10.10		2022年11月29日编译"
+	echo "trojan-go		$ss_basic_trojango_version		2022年12月29日编译"
 	echo "naive		$ss_basic_naive_version	"
 	echo -----------------------------------------------------------
 }

diff --git a/shadowsocks/scripts/ss_webtest.sh b/shadowsocks/scripts/ss_webtest.sh
@@ -405,6 +405,7 @@ create_trojango_json(){
 					}"
 	fi
 	[ -z "$(eval echo \$ssconf_basic_v2ray_mux_concurrency_$nu)" ] && local ssconf_basic_v2ray_mux_concurrency=8 || local ssconf_basic_v2ray_mux_concurrency=$(eval echo \$ssconf_basic_v2ray_mux_concurrency_$nu)
+	[ "$(eval echo \$ssconf_basic_fingerprint_$nu)" == "none" ] && local ssconf_basic_fingerprint="" || local ssconf_basic_fingerprint=$(eval echo \$ssconf_basic_fingerprint_$nu)
 		 #trojan go
 		 # 3335 for nat  
 		cat >"/tmp/tmp_trojango.json" <<-EOF
@@ -429,7 +430,8 @@ create_trojango_json(){
 					"http/1.1"
 					],
 					"session_ticket": true,
-					"reuse_session": true
+					"reuse_session": true,
+					"fingerprint": "$ssconf_basic_fingerprint"
 				},
 				"tcp": {
 					"no_delay": true,
@@ -475,7 +477,8 @@ create_trojango_json(){
 					"http/1.1"
 					],
 					"session_ticket": true,
-					"reuse_session": true
+					"reuse_session": true,
+					"fingerprint": "$ssconf_basic_fingerprint"
 				},
 				"tcp": {
 					"no_delay": true,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a1c3c1b597629ed8e68b6d3a8e49eeff trojan-go
		db85c1f3868cb4aca36579582afa487f trojan-go