v4.34.6

380_armv5_packge/4.34.6/md5sum.txt

@@ -0,0 +1 @@
+751a698f45369f6c05a46d9211b3fd91

380_armv5_packge/latest.txt

@@ -1 +1 @@
-4.34.5
+4.34.6

README.md

@@ -2,7 +2,7 @@
 support v2ray and xray binary update
 this project will update bin and package for arm_380_v5
 
-除插件原有功能外，另外支持xray,trojan,vless,xtls等一些其他更新, 支持混合节点订阅，支持vless:// trojan://格式订阅和导入。
+除插件原有功能外，另外支持xray,trojan,trojan-go,vless,xtls等一些其他更新, 支持混合节点订阅，支持vless:// trojan:// trojan-go://格式订阅和导入。
 
 目前xray已经可以完全替代v2ray了，xray支持vmess，vless和trojan。  
 

shadowsocks/install.sh

@@ -153,6 +153,8 @@ rm -rf /koolshare/bin/udp2raw
 rm -rf /koolshare/bin/speeder*
 rm -rf /koolshare/bin/v2ray
 rm -rf /koolshare/bin/v2ctl
+rm -rf /koolshare/bin/xray
+rm -rf /koolshare/bin/trojan-go
 rm -rf /koolshare/bin/jitterentropy-rngd
 rm -rf /koolshare/bin/haveged
 rm -rf /koolshare/bin/https_dns_proxy
@@ -235,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.34.5
-dbus set ss_basic_v2ray_date=20210407
+dbus set ss_basic_v2ray_version=4.34.6
+dbus set ss_basic_v2ray_date=20210412
 
 echo_date 一点点清理工作...
 rm -rf /tmp/shadowsocks* >/dev/null 2>&1

shadowsocks/scripts/ss_pack.sh

@@ -41,6 +41,8 @@ cp /koolshare/bin/speeder* $TARGET_FOLDER/bin/
 cp /koolshare/bin/udp2raw $TARGET_FOLDER/bin/
 cp /koolshare/bin/v2ray $TARGET_FOLDER/bin/
 cp /koolshare/bin/v2ctl $TARGET_FOLDER/bin/
+cp /koolshare/bin/xray $TARGET_FOLDER/bin/
+cp /koolshare/bin/trojan-go $TARGET_FOLDER/bin/
 cp /koolshare/bin/haveged $TARGET_FOLDER/bin/
 cp /koolshare/bin/https_dns_proxy $TARGET_FOLDER/bin/
 cp /koolshare/bin/dnsmasq $TARGET_FOLDER/bin/

shadowsocks/scripts/ss_proc_status.sh

@@ -123,6 +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 -----------------------------------------------------------
 }
 
@@ -143,6 +144,7 @@ check_status(){
 	HAPROXY=`pidof haproxy`
 	V2RAY=`pidof v2ray`
 	XRAY=`pidof xray`
+	trojango=`pidof trojan-go`
 	HDP=`pidof https_dns_proxy`
 	DMQ=`pidof dnsmasq`
 	SMD=$(pidof smartdns)
@@ -184,6 +186,7 @@ check_status(){
 		echo -----------------------------------------------------------
 		echo "程序		状态	PID"
 		[ -n "$XRAY" ] && echo "xray		工作中	pid：$XRAY" || echo "xray	未运行"	
+		[ -n "$trojango" ] && echo "trojan-go		工作中	pid：$trojango" || echo "trojan-go	未运行"	
 	fi
 
 	if [ -z "$ss_basic_koolgame_udp" ];then

shadowsocks/scripts/ss_rule_update.sh

@@ -6,7 +6,7 @@
 eval `dbus export ss`
 source /koolshare/scripts/base.sh
 alias echo_date='echo 【$(TZ=UTC-8 date -R +%Y年%m月%d日\ %X)】:'
-socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray"`
+socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
 if [ -n "$socksopen_b" ] && [ "$ss_basic_online_links_goss" == "1" ];then
 	echo_date "代理有开启，将使用代理网络..."
 	alias curlxx='curl --connect-timeout 8  --socks5-hostname 127.0.0.1:23456 '

shadowsocks/scripts/ss_update.sh

@@ -11,7 +11,7 @@ alias echo_date='echo 【$(TZ=UTC-8 date -R +%Y年%m月%d日\ %X)】:'
 #main_url="https://raw.githubusercontent.com/hq450/fancyss/master/fancyss_arm"
 main_url="https://raw.githubusercontent.com/cary-sas/v2ray_bin/main/380_armv5_packge"
 backup_url=""
-socksopen_b=`netstat -nlp | grep -w 23456|grep -E "local|v2ray|xray"`
+socksopen_b=`netstat -nlp | grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
 if [ -n "$socksopen_b" ] && [ "$ss_basic_online_links_goss" == "1" ];then
 	echo_date "代理有开启，将使用代理网络..."
 	alias curlxx='curl --connect-timeout 8  --socks5-hostname 127.0.0.1:23456 '

shadowsocks/scripts/ss_v2ray.sh

@@ -10,7 +10,7 @@ V2RAY_CONFIG_FILE="/koolshare/ss/v2ray.json"
 #url_main="https://raw.githubusercontent.com/hq450/fancyss/master/v2ray_binary"
 url_main="https://raw.githubusercontent.com/cary-sas/v2ray_bin/main/380_armv5/v2ray"
 url_back=""
-socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray"`
+socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
 if [ -n "$socksopen_b" ] && [ "$ss_basic_online_links_goss" == "1" ];then
 	echo_date "代理有开启，将使用代理网络..."
 	alias curlxx='curl --connect-timeout 8  --socks5-hostname 127.0.0.1:23456 '

shadowsocks/scripts/ss_webtest.sh

@@ -345,6 +345,122 @@ rm -rf /tmp/tmp_v2ray.json
 		EOF
 }
 
+
+create_trojango_json(){
+	rm -rf /tmp/tmp_trojango.json
+	rm -rf /tmp/tmp_trojango2.json
+	if [ "$(eval echo \$ssconf_basic_trojan_network_$nu)" == "1" ]; then
+		[ -n "$(eval echo \$ssconf_basic_v2ray_network_path_$nu)" ] && local ss_basic_v2ray_network_path=$(echo "/"$(eval echo \$ssconf_basic_v2ray_network_path_$nu)"" | sed 's,//,/,')
+		[ -n "$(eval echo \$ssconf_basic_v2ray_network_host_$nu)" ] && local ss_basic_v2ray_network_host=$(eval echo \$ssconf_basic_v2ray_network_host_$nu)
+		local ws="{ \"enabled\": true,
+					\"path\":  \"$ss_basic_v2ray_network_path\",
+					\"host\":  \"$ss_basic_v2ray_network_host\"
+					}"
+	else
+		local ws="{ \"enabled\": false,
+					\"path\":  \"\",
+					\"host\":  \"\"
+					}"
+	fi
+		echo_date 生成Trojan Go配置文件...
+		 #trojan go
+		 # 3335 for nat  
+		cat >"/tmp/tmp_trojango.json" <<-EOF
+			{
+				"run_type": "nat",
+				"local_addr": "0.0.0.0",
+				"local_port": 3335,
+				"remote_addr": "$array1",
+				"remote_port": $array2,
+				"log_level": 5,
+				"log_file": "/tmp/trojan-go_log.log",
+				"password": [
+				"$array3"
+				],
+				"disable_http_check": false,
+				"udp_timeout": 60,
+				"ssl": {
+					"verify": true,
+					"verify_hostname": true,
+					"cert": "/rom/etc/ssl/certs/ca-certificates.crt",
+					"cipher": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA",
+					"sni": "$(eval echo \$ssconf_basic_trojan_sni_$nu)",
+					"alpn": [
+					"http/1.1"
+					],
+					"session_ticket": true,
+					"reuse_session": true
+				},
+				"tcp": {
+					"no_delay": true,
+					"keep_alive": true,
+					"prefer_ipv4": true
+				},
+				"mux": {
+					"enabled": false,
+					"concurrency": 8,
+					"idle_timeout": 60
+				},
+				"websocket": $ws
+				,
+				"shadowsocks": {
+					"enabled": false,
+					"method": "AES-128-GCM",
+					"password": ""
+				}
+			}
+		EOF
+
+
+		 #  23458 for socks5  
+		cat >"/tmp/tmp_trojango2.json" <<-EOF
+			{
+				"run_type": "client",
+				"local_addr": "127.0.0.1",
+				"local_port": 23458,
+				"remote_addr": "$array1",
+				"remote_port": $array2,
+				"log_level": 5,
+				"log_file": "/tmp/trojan-go_log.log",
+				"password": [
+				"$array3"
+				],
+				"disable_http_check": false,
+				"udp_timeout": 60,
+				"ssl": {
+					"verify": true,
+					"verify_hostname": true,
+					"cert": "/rom/etc/ssl/certs/ca-certificates.crt",
+					"cipher": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA",
+					"sni": "$(eval echo \$ssconf_basic_trojan_sni_$nu)",
+					"alpn": [
+					"http/1.1"
+					],
+					"session_ticket": true,
+					"reuse_session": true
+				},
+				"tcp": {
+					"no_delay": true,
+					"keep_alive": true,
+					"prefer_ipv4": true
+				},
+				"mux": {
+					"enabled": false,
+					"concurrency": 8,
+					"idle_timeout": 60
+				},
+				"websocket": $ws
+				,
+				"shadowsocks": {
+					"enabled": false,
+					"method": "AES-128-GCM",
+					"password": ""
+				}
+			}
+		EOF
+
+}
+
 start_webtest(){
 	array1=`dbus get ssconf_basic_server_$nu`
 	array2=`dbus get ssconf_basic_port_$nu`
@@ -359,7 +475,8 @@ start_webtest(){
 	array11=`dbus get ssconf_basic_mode_$nu`
 	array12=`dbus get ssconf_basic_type_$nu`	
 	array13=`dbus get ssconf_basic_v2ray_protocol_$nu`
-
+	array14=`dbus get ssconf_basic_trojan_binary_$nu`
+
 	if [ "$array10" != "" ];then
 		if [ "$array9" == "1" ];then
 			ARG_V2RAY_PLUGIN="--plugin v2ray-plugin --plugin-opts $array10"
@@ -409,15 +526,27 @@ start_webtest(){
 			kill -9 `ps|grep xray|grep 'tmp_v2ray'|awk '{print $1}'` >/dev/null 2>&1	
 			rm -rf /tmp/tmp_v2ray.json
 
-		elif [ "$array12" == "4" ];then   #trojan
+		elif [ "$array12" == "4" -a "$array14" == "Trojan" ];then   #trojan
 			create_trojan_json 
 			xray run -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &
 			sleep 3
 			result=`curl -o /dev/null -s -w %{time_total}:%{speed_download} --connect-timeout 15 --socks5-hostname 127.0.0.1:23458 $ssconf_basic_test_domain`
 			sleep 1
 			dbus set ssconf_basic_webtest_$nu=$result
 			kill -9 `ps|grep xray|grep 'tmp_v2ray'|awk '{print $1}'` >/dev/null 2>&1	
-			rm -rf /tmp/tmp_v2ray.json				
+			rm -rf /tmp/tmp_v2ray.json	
+
+		elif [ "$array12" == "4" -a "$array14" == "Trojan-Go" ];then   #trojan go
+			create_trojango_json 
+			trojan-go -config=/tmp/tmp_trojango.json >/dev/null 2>&1 &
+			trojan-go -config=/tmp/tmp_trojango2.json >/dev/null 2>&1 &
+			sleep 3
+			result=`curl -o /dev/null -s -w %{time_total}:%{speed_download} --connect-timeout 15 --socks5-hostname 127.0.0.1:23458 $ssconf_basic_test_domain`
+			sleep 1
+			dbus set ssconf_basic_webtest_$nu=$result
+			kill -9 `ps|grep 'trojan-go' | grep 'tmp_trojango'|awk '{print $1}'` >/dev/null 2>&1	
+			kill -9 `ps|grep 'trojan-go' | grep 'tmp_trojango2'|awk '{print $1}'` >/dev/null 2>&1
+			rm -rf /tmp/tmp_trojango.json /tmp/tmp_trojango2.json	 			
 		fi
 
 	else

shadowsocks/scripts/ss_xray.sh

@@ -10,7 +10,7 @@ xray_CONFIG_FILE="/koolshare/ss/v2ray.json"
 #url_main="https://raw.githubusercontent.com/hq450/fancyss/master/xray_binary"
 url_main="https://raw.githubusercontent.com/cary-sas/v2ray_bin/main/380_armv5/xray"
 url_back=""
-socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray"`
+socksopen_b=`netstat -nlp|grep -w 23456|grep -E "local|v2ray|xray|trojan-go"`
 
 if [ -n "$socksopen_b" ] && [ "$ss_basic_online_links_goss" == "1" ];then
 	echo_date "代理有开启，将使用代理网络..."