v4.37.4

cary-sas · Jul 14, 2023 · 55ecd96 · 55ecd96
1 parent 33c90c8
commit 55ecd96
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 41 deletions.
diff --git a/380_armv5_packge/4.37.4/md5sum.txt b/380_armv5_packge/4.37.4/md5sum.txt
@@ -0,0 +1 @@
+b2c49b56b657e00defaea63d8efbe36f
diff --git a/380_armv5_packge/4.37.4/shadowsocks.tar.gz b/380_armv5_packge/4.37.4/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":"2023-07-07_22:35:10",
+"build_date":"2023-07-14_23:43:08",
 "description":"科学上网",
 "home_url":"Main_Ss_Content.asp",
-"md5":"4d97f085de171ac10a64c2e30f0c040f",
+"md5":"b2c49b56b657e00defaea63d8efbe36f",
 "name":"shadowsocks",
-"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.3/shadowsocks.tar.gz",
-"version":"4.37.3"
+"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.4/shadowsocks.tar.gz",
+"version":"4.37.4"
 }
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.37.3
+4.37.4
diff --git a/shadowsocks/scripts/ss_webtest.sh b/shadowsocks/scripts/ss_webtest.sh
@@ -26,10 +26,10 @@ speed_test_curl(){
 	sleep 1	
 	local KB=`awk -v sum=$Byte -v n=1024 'BEGIN{printf "%0.2f\n", sum/n}'`
 	local MB=`awk -v sum=$KB -v n=1024 'BEGIN{printf "%0.2f\n", sum/n}'`
-	Byte=${Byte%.*}
-	KB=${KB%.*}
-	result=`awk -v M=$MB -v k=$KB -v i=$Byte 'BEGIN { if(i>=1048576) print M"M"; else if(i<1024 && i>0) print i; else print k"K" }'`
-	[ -z "$Byte" -o "$result" == "0K" ] && result="failed"
+	local Byte=${Byte%.*}
+	local KB=${KB%.*}
+	local result=`awk -v M=$MB -v k=$KB -v i=$Byte 'BEGIN { if(i>=1048576) print M"M"; else if(i<1024 && i>0) print i; else print k"K" }'`
+	[ -z "$Byte" -o "$result" == "0K" ] && local result="failed"
 	dbus set ssconf_basic_webtest_$nu=$result
 }
 # flush previous test value in the table
@@ -215,7 +215,7 @@ rm -f /tmp/tmp_v2ray.json
 				\"connectionReuse\": true,
 				\"fingerprint\": $(get_fingerprint $local_fingerprint),
 				\"path\": $(get_path $local_path),
-				\"headers\": $(get_ws_header local_header)
+				\"headers\": $(get_ws_header $local_header)
 				}"
 			;;
 		h2)
@@ -255,7 +255,7 @@ rm -f /tmp/tmp_v2ray.json
 						"protocol": "socks",
 						"settings": {
 							"auth": "noauth",
-							"udp": true,
+							"udp": false,
 							"ip": "127.0.0.1",
 							"clients": null
 						},
@@ -266,7 +266,7 @@ rm -f /tmp/tmp_v2ray.json
 						"port": 3335,
 						"protocol": "dokodemo-door",
 						"settings": {
-							"network": "tcp,udp",
+							"network": "tcp",
 							"followRedirect": true
 						}
 					}
@@ -380,7 +380,7 @@ rm -f /tmp/tmp_v2ray.json
 						"protocol": "socks",
 						"settings": {
 							"auth": "noauth",
-							"udp": true,
+							"udp": false,
 							"ip": "127.0.0.1",
 							"clients": null
 						},
@@ -391,7 +391,7 @@ rm -f /tmp/tmp_v2ray.json
 						"port": 3335,
 						"protocol": "dokodemo-door",
 						"settings": {
-							"network": "tcp,udp",
+							"network": "tcp",
 							"followRedirect": true
 						}
 					}
@@ -576,7 +576,7 @@ create_ss2022_json(){
 						"protocol": "socks",
 						"settings": {
 							"auth": "noauth",
-							"udp": true,
+							"udp": false,
 							"ip": "127.0.0.1",
 							"clients": null
 						},
@@ -587,7 +587,7 @@ create_ss2022_json(){
 						"port": 3335,
 						"protocol": "dokodemo-door",
 						"settings": {
-							"network": "tcp,udp",
+							"network": "tcp",
 							"followRedirect": true
 						}
 					}
@@ -673,14 +673,14 @@ start_webtest(){
 			    "method":"$array4"
 			}
 		EOF
-			rss-local -b 0.0.0.0 -l 23458 -c /tmp/tmp_ss.json -u -f /var/run/sslocal2.pid >/dev/null 2>&1
+			rss-local -b 0.0.0.0 -l 23458 -c /tmp/tmp_ss.json -f /var/run/sslocal2.pid >/dev/null 2>&1
 			# result=`curl -o /dev/null -s -w %{time_connect}:%{time_starttransfer}:%{time_total}:%{speed_download} --socks5-hostname 127.0.0.1:23458 https://www.google.com/`
 			speed_test_curl
 			kill -9 `ps|grep -w rss-local|grep 23458|awk '{print $1}'` >/dev/null 2>&1
 			rm -f /tmp/tmp_ss.json
 
 		elif [ "$array12" == "0" ];then   #ss
-			ss-local -b 0.0.0.0 -l 23458 -s $server_ip -p $array2 -k $array3 -m $array4 -u $ARG_V2RAY_PLUGIN -f /var/run/sslocal3.pid >/dev/null 2>&1
+			ss-local -b 0.0.0.0 -l 23458 -s $server_ip -p $array2 -k $array3 -m $array4 $ARG_V2RAY_PLUGIN -f /var/run/sslocal3.pid >/dev/null 2>&1
 			speed_test_curl
 			ss_local_pid=$(ps|grep -w ss-local|grep 23458|awk '{print $1}')			
 			if [ -n "$ARG_V2RAY_PLUGIN" ];then 

diff --git a/shadowsocks/ss/ssconfig.sh b/shadowsocks/ss/ssconfig.sh
@@ -2499,8 +2499,8 @@ apply_nat_rules(){
 	# 如果是主模式游戏模式，则把SHADOWSOCKS链中剩余udp流量转发给SHADOWSOCKS_GAM链
 	# 如果主模式不是游戏模式，则不需要把SHADOWSOCKS链中剩余udp流量转发给SHADOWSOCKS_GAM，不然会造成其他模式主机的udp也走游戏模式
 	###[ "$mangle" == "1" ] && ss_acl_default_mode=3
-	[ "$ss_acl_default_mode" != "0" ] && [ "$ss_acl_default_mode" != "3" ] && ss_acl_default_mode=0
-	[ "$ss_basic_mode" == "3" ] && iptables -t mangle -A SHADOWSOCKS -p udp -j $(get_action_chain $ss_acl_default_mode)
+	[ "$ss_acl_default_mode" != "0" ] && [ "$ss_acl_default_mode" != "3" ] && [ "$ss_basic_udp_sync" != "1" ]  && ss_acl_default_mode=0
+	[ "$ss_basic_mode" == "3" ] || [ "$ss_basic_udp_sync" == "1" ]  && iptables -t mangle -A SHADOWSOCKS -p udp -j $(get_action_chain $ss_acl_default_mode)
 	# 重定所有流量到 SHADOWSOCKS
 	KP_NU=`iptables -nvL PREROUTING -t nat |sed 1,2d | sed -n '/KOOLPROXY/='|head -n1`
 	[ "$KP_NU" == "" ] && KP_NU=0

diff --git a/shadowsocks/ss/version b/shadowsocks/ss/version
@@ -1 +1 @@
-4.37.3
+4.37.4
diff --git a/shadowsocks/webs/Main_Ss_Content.asp b/shadowsocks/webs/Main_Ss_Content.asp
@@ -312,11 +312,11 @@ function save() {
 			dbus["ssconf_basic_v2ray_headtype_kcp_" + node_sel] = vmess_node.type;
 		}
 		dbus["ss_basic_v2ray_network_host"] = vmess_node.host;
-		//dbus["ss_basic_v2ray_network_tlshost"] = vmess_node.tlshost;
-		//dbus["ss_basic_v2ray_network_flow"] = vmess_node.flow;
+		dbus["ss_basic_v2ray_network_tlshost"] = vmess_node.tlshost;
+		dbus["ss_basic_v2ray_network_flow"] = vmess_node.flow;
 		dbus["ssconf_basic_v2ray_network_host_" + node_sel] = vmess_node.host;
-		//dbus["ssconf_basic_v2ray_network_tlshost_" + node_sel] = vmess_node.tlshost;
-		//dbus["ssconf_basic_v2ray_network_flow_" + node_sel] = vmess_node.flow;
+		dbus["ssconf_basic_v2ray_network_tlshost_" + node_sel] = vmess_node.tlshost;
+		dbus["ssconf_basic_v2ray_network_flow_" + node_sel] = vmess_node.flow;
 		dbus["ss_basic_v2ray_network_path"] = vmess_node.path;
 		dbus["ssconf_basic_v2ray_network_path_" + node_sel] = vmess_node.path;
 		if(vmess_node.tls == "tls"){
@@ -956,6 +956,9 @@ function protocol_change_on(xy){
 //	}else{
 //		$("#use_uuid_on").text("用户id（id）")
 //	}
+	if (xy == "vless") {
+		E("ss_basic_v2ray_alterid").value = "";
+	}
 	verifyFields();
 }
 
@@ -971,6 +974,9 @@ function protocol_change_off(xy){
 //	}else{
 //		$("#use_uuid_off").text("用户id（id）")
 //	}
+	if (xy == "vless") {
+		E("ss_node_table_v2ray_alterid").value = "";
+	}
 	verifyFields();
 }
 
@@ -992,6 +998,11 @@ function trojan_change_off(xy){
 	}else{
 		E("ss_node_table_trojan_binary").value = "Trojan";
 	}
+	if(xy=="Trojan"){
+	    E("ss_node_table_v2ray_network_path").value = "";
+		E("ss_node_table_v2ray_network_host").value = "";
+		E("ss_node_table_fingerprint").value = "";
+	}
 	verifyFields();
 }
 function network_change_off(xy){
@@ -1002,6 +1013,22 @@ function network_change_off(xy){
 	}
 	verifyFields();
 }
+function flow_change_off(xy){
+	if (xy != "tcp") {
+		E("ss_node_table_v2ray_network_flow").value = "";
+	}else if (xy == "tcp" || xy == "grpc" ) {
+		E("ss_node_table_v2ray_network_path").value = "";
+		E("ss_node_table_v2ray_network_host").value = "";
+	}
+	verifyFields();
+}
+function reality_change_off(xy){
+	if (xy != "reality") {
+		E("ss_node_table_xray_publicKey").value = "";
+		E("ss_node_table_xray_shortId").value = "";
+	}
+	verifyFields();
+}
 
 function ss_node_sel(s) {
 	if(!s){
@@ -1236,8 +1263,8 @@ function Add_profile() { //点击节点页面内添加节点动作
 	E("ss_node_table_ss_v2ray_plugin").value = "0"
 	E("ss_node_table_ss_v2ray_plugin_opts").value = "";
 	E("ss_node_table_rss_protocol").value = "origin";
-//	E("ss_node_table_naive_protocol").value = "https";
-//	E("ss_node_table_naive_user").value = "";
+	E("ss_node_table_naive_protocol").value = "https";
+	E("ss_node_table_naive_user").value = "";
 	E("ss_node_table_rss_protocol_param").value = "";
 	E("ss_node_table_rss_obfs").value = "plain";
 	E("ss_node_table_rss_obfs_param").value = "";
@@ -1248,7 +1275,10 @@ function Add_profile() { //点击节点页面内添加节点动作
 	E("ss_node_table_v2ray_json").value = "";
 	E("ss_node_table_v2ray_serviceName").value = "";
 	E("ss_node_table_v2ray_network_path").value = "";
+	E("ss_node_table_v2ray_network_flow").value = "";
 	E("ss_node_table_v2ray_network_tlshost").value = "";
+	E("ss_node_table_xray_publicKey").value = "";
+	E("ss_node_table_xray_shortId").value = "";
 	E("ss_node_table_trojan_sni").value = "";
 	E("ss_node_table_trojan_binary").value = "Trojan";
 	E("ss_node_table_trojan_network").value = "0";
@@ -1703,8 +1733,8 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
 					ns[p + "_v2ray_headtype_kcp_" + node_global_max] = vmess_node.type;
 				}
 				ns[p + "_v2ray_network_host_" + node_global_max] = vmess_node.host;
-//				ns[p + "_v2ray_network_tlshost_" + node_global_max] = vmess_node.tlshost;
-//				ns[p + "_v2ray_network_flow_" + node_global_max] = vmess_node.flow;
+				ns[p + "_v2ray_network_tlshost_" + node_global_max] = vmess_node.tlshost;
+				ns[p + "_v2ray_network_flow_" + node_global_max] = vmess_node.flow;
 				ns[p + "_v2ray_network_path_" + node_global_max] = vmess_node.path;
 				if(vmess_node.tls == "tls"){
 					ns[p + "_v2ray_network_security_" + node_global_max] = "tls";
@@ -1762,8 +1792,8 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
 				E("ss_node_table_ss_v2ray_plugin").value = "0"
 				E("ss_node_table_ss_v2ray_plugin_opts").value = "";
 				E("ss_node_table_rss_protocol").value = "origin";
-//				E("ss_node_table_naive_protocol").value = "https";
-//				E("ss_node_table_naive_user").value = "";
+				E("ss_node_table_naive_protocol").value = "https";
+				E("ss_node_table_naive_user").value = "";
 				E("ss_node_table_rss_protocol_param").value = "";
 				E("ss_node_table_rss_obfs").value = "plain";
 				E("ss_node_table_rss_obfs_param").value = "";
@@ -1776,10 +1806,13 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
 				E("ss_node_table_trojan_binary").value = "Trojan";		
 				E("ss_node_table_trojan_network").value = "0";		
 				E("ss_node_table_trojan_sni").value = "";	
-	//			E("ss_node_table_v2ray_network_tlshost").value = ""; 
+				E("ss_node_table_v2ray_network_tlshost").value = ""; 
+				E("ss_node_table_v2ray_network_flow").value = "";
 				E("ss_node_table_allowinsecure").value = "0";
 				E("ss_node_table_v2ray_mux_enable").value = "0";
-				E("ss_node_table_fingerprint").value = "";					
+				E("ss_node_table_fingerprint").value = "";	
+				E("ss_node_table_xray_publicKey").value = "";
+				E("ss_node_table_xray_shortId").value = "";				
 				cancel_add_rule();
 			}
 		}
@@ -2077,7 +2110,8 @@ function edit_conf_table(o) { //编辑节点功能，显示编辑面板
 	xray_change_off(c["v2ray_xray"])
 	trojan_change_off(c["trojan_binary"])
 	network_change_off(c["trojan_network"])
-	
+	flow_change_off(c["v2ray_network"])
+	reality_change_off(c["v2ray_network_security"])
 	E("cancelBtn").style.display = "";
 	E("add_node").style.display = "none";
 	E("edit_node").style.display = "";
@@ -2191,8 +2225,8 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
 					ns["ssconf_basic_v2ray_headtype_kcp_" + myid] = vmess_node.type;
 				}
 				ns["ssconf_basic_v2ray_network_host_" + myid] = vmess_node.host;
-//				ns["ssconf_basic_v2ray_network_tlshost_" + myid] = vmess_node.tlshost;
-//				ns["ssconf_basic_v2ray_network_flow_" + myid] = vmess_node.flow;
+				ns["ssconf_basic_v2ray_network_tlshost_" + myid] = vmess_node.tlshost;
+				ns["ssconf_basic_v2ray_network_flow_" + myid] = vmess_node.flow;
 				ns["ssconf_basic_v2ray_network_path_" + myid] = vmess_node.path;
 				if(vmess_node.tls == "tls"){
 					ns["ssconf_basic_v2ray_network_security_" + myid] = "tls";
@@ -2242,8 +2276,8 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
 			E("ss_node_table_ss_v2ray_plugin").value = "0"
 			E("ss_node_table_ss_v2ray_plugin_opts").value = "";
 			E("ss_node_table_rss_protocol").value = "origin";
-//			E("ss_node_table_naive_protocol").value = "https";
-//			E("ss_node_table_naive_user").value = "";
+			E("ss_node_table_naive_protocol").value = "https";
+			E("ss_node_table_naive_user").value = "";
 			E("ss_node_table_rss_protocol_param").value = "";
 			E("ss_node_table_rss_obfs").value = "plain";
 			E("ss_node_table_rss_obfs_param").value = "";
@@ -2257,9 +2291,12 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
 			E("ss_node_table_trojan_network").value = "0";	
 			E("ss_node_table_trojan_sni").value = "";
 			E("ss_node_table_fingerprint").value = "";
-			E("ss_node_table_v2ray_network_tlshost").value = "";				
+			E("ss_node_table_v2ray_network_tlshost").value = "";
+			E("ss_node_table_v2ray_network_flow").value = "";				
 			E("ss_node_table_allowinsecure").value = "0";
 			E("ss_node_table_v2ray_mux_enable").value = "0";
+			E("ss_node_table_xray_publicKey").value = "";
+			E("ss_node_table_xray_shortId").value = "";		
 		}
 	});
 	updateSs_node_listView();
@@ -3922,7 +3959,7 @@ function set_cron(action) {
 															<tr id="v2ray_network_tr" style="display: none;">
 																<th width="35%">传输协议 (network)</th>
 																<td>
-																	<select id="ss_node_table_v2ray_network" name="ss_node_table_v2ray_network" style="width:350px;margin:0px 0px 0px 2px;" class="input_option" onchange="verifyFields(this, 1);">
+																	<select id="ss_node_table_v2ray_network" name="ss_node_table_v2ray_network" style="width:350px;margin:0px 0px 0px 2px;" class="input_option" onchange="flow_change_off(this.value);">
 																		<option value="tcp">tcp</option>
 																		<option value="kcp">kcp</option>
 																		<option value="ws">ws</option>
@@ -3972,7 +4009,7 @@ function set_cron(action) {
 															<tr id="v2ray_network_security_tr" style="display: none;">
 																<th width="35%">底层传输安全</th>
 																<td>
-																	<select id="ss_node_table_v2ray_network_security" name="ss_node_table_v2ray_network_security" onchange="verifyFields(this, 1);" style="width:350px;margin:0px 0px 0px 2px;" class="input_option">
+																	<select id="ss_node_table_v2ray_network_security" name="ss_node_table_v2ray_network_security" onchange="reality_change_off(this.value);" style="width:350px;margin:0px 0px 0px 2px;" class="input_option">
 																		<option value="none">关闭</option>
 																		<option value="tls">tls</option>
 																		<option value="xtls">xtls</option>