Skip to content

Commit 55ecd96

Browse files
cary-sascary-sas
committed
v4.37.4
1 parent 33c90c8 commit 55ecd96

File tree

8 files changed

+79
-41
lines changed

8 files changed

+79
-41
lines changed

‎380_armv5_packge/4.37.4/md5sum.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b2c49b56b657e00defaea63d8efbe36f

‎380_armv5_packge/4.37.4/shadowsocks.tar.gz‎

26.3 MB
Binary file not shown.

‎380_armv5_packge/config.json.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"build_date":"2023-07-07_22:35:10",
2+
"build_date":"2023-07-14_23:43:08",
33
"description":"科学上网",
44
"home_url":"Main_Ss_Content.asp",
5-
"md5":"4d97f085de171ac10a64c2e30f0c040f",
5+
"md5":"b2c49b56b657e00defaea63d8efbe36f",
66
"name":"shadowsocks",
7-
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.3/shadowsocks.tar.gz",
8-
"version":"4.37.3"
7+
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.4/shadowsocks.tar.gz",
8+
"version":"4.37.4"
99
}

‎380_armv5_packge/latest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.37.3
1+
4.37.4

‎shadowsocks/scripts/ss_webtest.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ speed_test_curl(){
2626
sleep 1
2727
local KB=`awk -v sum=$Byte -v n=1024 'BEGIN{printf "%0.2f\n", sum/n}'`
2828
local MB=`awk -v sum=$KB -v n=1024 'BEGIN{printf "%0.2f\n", sum/n}'`
29-
Byte=${Byte%.*}
30-
KB=${KB%.*}
31-
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" }'`
32-
[ -z "$Byte" -o "$result" == "0K" ] && result="failed"
29+
local Byte=${Byte%.*}
30+
local KB=${KB%.*}
31+
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" }'`
32+
[ -z "$Byte" -o "$result" == "0K" ] && local result="failed"
3333
dbus set ssconf_basic_webtest_$nu=$result
3434
}
3535
# flush previous test value in the table
@@ -215,7 +215,7 @@ rm -f /tmp/tmp_v2ray.json
215215
\"connectionReuse\": true,
216216
\"fingerprint\": $(get_fingerprint $local_fingerprint),
217217
\"path\": $(get_path $local_path),
218-
\"headers\": $(get_ws_header local_header)
218+
\"headers\": $(get_ws_header $local_header)
219219
}"
220220
;;
221221
h2)
@@ -255,7 +255,7 @@ rm -f /tmp/tmp_v2ray.json
255255
"protocol": "socks",
256256
"settings": {
257257
"auth": "noauth",
258-
"udp": true,
258+
"udp": false,
259259
"ip": "127.0.0.1",
260260
"clients": null
261261
},
@@ -266,7 +266,7 @@ rm -f /tmp/tmp_v2ray.json
266266
"port": 3335,
267267
"protocol": "dokodemo-door",
268268
"settings": {
269-
"network": "tcp,udp",
269+
"network": "tcp",
270270
"followRedirect": true
271271
}
272272
}
@@ -380,7 +380,7 @@ rm -f /tmp/tmp_v2ray.json
380380
"protocol": "socks",
381381
"settings": {
382382
"auth": "noauth",
383-
"udp": true,
383+
"udp": false,
384384
"ip": "127.0.0.1",
385385
"clients": null
386386
},
@@ -391,7 +391,7 @@ rm -f /tmp/tmp_v2ray.json
391391
"port": 3335,
392392
"protocol": "dokodemo-door",
393393
"settings": {
394-
"network": "tcp,udp",
394+
"network": "tcp",
395395
"followRedirect": true
396396
}
397397
}
@@ -576,7 +576,7 @@ create_ss2022_json(){
576576
"protocol": "socks",
577577
"settings": {
578578
"auth": "noauth",
579-
"udp": true,
579+
"udp": false,
580580
"ip": "127.0.0.1",
581581
"clients": null
582582
},
@@ -587,7 +587,7 @@ create_ss2022_json(){
587587
"port": 3335,
588588
"protocol": "dokodemo-door",
589589
"settings": {
590-
"network": "tcp,udp",
590+
"network": "tcp",
591591
"followRedirect": true
592592
}
593593
}
@@ -673,14 +673,14 @@ start_webtest(){
673673
"method":"$array4"
674674
}
675675
EOF
676-
rss-local -b 0.0.0.0 -l 23458 -c /tmp/tmp_ss.json -u -f /var/run/sslocal2.pid >/dev/null 2>&1
676+
rss-local -b 0.0.0.0 -l 23458 -c /tmp/tmp_ss.json -f /var/run/sslocal2.pid >/dev/null 2>&1
677677
# 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/`
678678
speed_test_curl
679679
kill -9 `ps|grep -w rss-local|grep 23458|awk '{print $1}'` >/dev/null 2>&1
680680
rm -f /tmp/tmp_ss.json
681681

682682
elif [ "$array12" == "0" ];then #ss
683-
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
683+
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
684684
speed_test_curl
685685
ss_local_pid=$(ps|grep -w ss-local|grep 23458|awk '{print $1}')
686686
if [ -n "$ARG_V2RAY_PLUGIN" ];then

‎shadowsocks/ss/ssconfig.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2499,8 +2499,8 @@ apply_nat_rules(){
24992499
# 如果是主模式游戏模式，则把SHADOWSOCKS链中剩余udp流量转发给SHADOWSOCKS_GAM链
25002500
# 如果主模式不是游戏模式，则不需要把SHADOWSOCKS链中剩余udp流量转发给SHADOWSOCKS_GAM，不然会造成其他模式主机的udp也走游戏模式
25012501
###[ "$mangle" == "1" ] && ss_acl_default_mode=3
2502-
[ "$ss_acl_default_mode" != "0" ] && [ "$ss_acl_default_mode" != "3" ] && ss_acl_default_mode=0
2503-
[ "$ss_basic_mode" == "3" ] && iptables -t mangle -A SHADOWSOCKS -p udp -j $(get_action_chain $ss_acl_default_mode)
2502+
[ "$ss_acl_default_mode" != "0" ] && [ "$ss_acl_default_mode" != "3" ] && [ "$ss_basic_udp_sync" != "1" ] && ss_acl_default_mode=0
2503+
[ "$ss_basic_mode" == "3" ] || [ "$ss_basic_udp_sync" == "1" ] && iptables -t mangle -A SHADOWSOCKS -p udp -j $(get_action_chain $ss_acl_default_mode)
25042504
# 重定所有流量到 SHADOWSOCKS
25052505
KP_NU=`iptables -nvL PREROUTING -t nat |sed 1,2d | sed -n '/KOOLPROXY/='|head -n1`
25062506
[ "$KP_NU" == "" ] && KP_NU=0

‎shadowsocks/ss/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.37.3
1+
4.37.4

‎shadowsocks/webs/Main_Ss_Content.asp‎

Lines changed: 57 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@ function save() {
312312
dbus["ssconf_basic_v2ray_headtype_kcp_" + node_sel] = vmess_node.type;
313313
}
314314
dbus["ss_basic_v2ray_network_host"] = vmess_node.host;
315-
//dbus["ss_basic_v2ray_network_tlshost"] = vmess_node.tlshost;
316-
//dbus["ss_basic_v2ray_network_flow"] = vmess_node.flow;
315+
dbus["ss_basic_v2ray_network_tlshost"] = vmess_node.tlshost;
316+
dbus["ss_basic_v2ray_network_flow"] = vmess_node.flow;
317317
dbus["ssconf_basic_v2ray_network_host_" + node_sel] = vmess_node.host;
318-
//dbus["ssconf_basic_v2ray_network_tlshost_" + node_sel] = vmess_node.tlshost;
319-
//dbus["ssconf_basic_v2ray_network_flow_" + node_sel] = vmess_node.flow;
318+
dbus["ssconf_basic_v2ray_network_tlshost_" + node_sel] = vmess_node.tlshost;
319+
dbus["ssconf_basic_v2ray_network_flow_" + node_sel] = vmess_node.flow;
320320
dbus["ss_basic_v2ray_network_path"] = vmess_node.path;
321321
dbus["ssconf_basic_v2ray_network_path_" + node_sel] = vmess_node.path;
322322
if(vmess_node.tls == "tls"){
@@ -956,6 +956,9 @@ function protocol_change_on(xy){
956956
// }else{
957957
// $("#use_uuid_on").text("用户id（id）")
958958
// }
959+
if (xy == "vless") {
960+
E("ss_basic_v2ray_alterid").value = "";
961+
}
959962
verifyFields();
960963
}
961964
@@ -971,6 +974,9 @@ function protocol_change_off(xy){
971974
// }else{
972975
// $("#use_uuid_off").text("用户id（id）")
973976
// }
977+
if (xy == "vless") {
978+
E("ss_node_table_v2ray_alterid").value = "";
979+
}
974980
verifyFields();
975981
}
976982
@@ -992,6 +998,11 @@ function trojan_change_off(xy){
992998
}else{
993999
E("ss_node_table_trojan_binary").value = "Trojan";
9941000
}
1001+
if(xy=="Trojan"){
1002+
E("ss_node_table_v2ray_network_path").value = "";
1003+
E("ss_node_table_v2ray_network_host").value = "";
1004+
E("ss_node_table_fingerprint").value = "";
1005+
}
9951006
verifyFields();
9961007
}
9971008
function network_change_off(xy){
@@ -1002,6 +1013,22 @@ function network_change_off(xy){
10021013
}
10031014
verifyFields();
10041015
}
1016+
function flow_change_off(xy){
1017+
if (xy != "tcp") {
1018+
E("ss_node_table_v2ray_network_flow").value = "";
1019+
}else if (xy == "tcp" || xy == "grpc" ) {
1020+
E("ss_node_table_v2ray_network_path").value = "";
1021+
E("ss_node_table_v2ray_network_host").value = "";
1022+
}
1023+
verifyFields();
1024+
}
1025+
function reality_change_off(xy){
1026+
if (xy != "reality") {
1027+
E("ss_node_table_xray_publicKey").value = "";
1028+
E("ss_node_table_xray_shortId").value = "";
1029+
}
1030+
verifyFields();
1031+
}
10051032
10061033
function ss_node_sel(s) {
10071034
if(!s){
@@ -1236,8 +1263,8 @@ function Add_profile() { //点击节点页面内添加节点动作
12361263
E("ss_node_table_ss_v2ray_plugin").value = "0"
12371264
E("ss_node_table_ss_v2ray_plugin_opts").value = "";
12381265
E("ss_node_table_rss_protocol").value = "origin";
1239-
// E("ss_node_table_naive_protocol").value = "https";
1240-
// E("ss_node_table_naive_user").value = "";
1266+
E("ss_node_table_naive_protocol").value = "https";
1267+
E("ss_node_table_naive_user").value = "";
12411268
E("ss_node_table_rss_protocol_param").value = "";
12421269
E("ss_node_table_rss_obfs").value = "plain";
12431270
E("ss_node_table_rss_obfs_param").value = "";
@@ -1248,7 +1275,10 @@ function Add_profile() { //点击节点页面内添加节点动作
12481275
E("ss_node_table_v2ray_json").value = "";
12491276
E("ss_node_table_v2ray_serviceName").value = "";
12501277
E("ss_node_table_v2ray_network_path").value = "";
1278+
E("ss_node_table_v2ray_network_flow").value = "";
12511279
E("ss_node_table_v2ray_network_tlshost").value = "";
1280+
E("ss_node_table_xray_publicKey").value = "";
1281+
E("ss_node_table_xray_shortId").value = "";
12521282
E("ss_node_table_trojan_sni").value = "";
12531283
E("ss_node_table_trojan_binary").value = "Trojan";
12541284
E("ss_node_table_trojan_network").value = "0";
@@ -1703,8 +1733,8 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
17031733
ns[p + "_v2ray_headtype_kcp_" + node_global_max] = vmess_node.type;
17041734
}
17051735
ns[p + "_v2ray_network_host_" + node_global_max] = vmess_node.host;
1706-
// ns[p + "_v2ray_network_tlshost_" + node_global_max] = vmess_node.tlshost;
1707-
// ns[p + "_v2ray_network_flow_" + node_global_max] = vmess_node.flow;
1736+
ns[p + "_v2ray_network_tlshost_" + node_global_max] = vmess_node.tlshost;
1737+
ns[p + "_v2ray_network_flow_" + node_global_max] = vmess_node.flow;
17081738
ns[p + "_v2ray_network_path_" + node_global_max] = vmess_node.path;
17091739
if(vmess_node.tls == "tls"){
17101740
ns[p + "_v2ray_network_security_" + node_global_max] = "tls";
@@ -1762,8 +1792,8 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
17621792
E("ss_node_table_ss_v2ray_plugin").value = "0"
17631793
E("ss_node_table_ss_v2ray_plugin_opts").value = "";
17641794
E("ss_node_table_rss_protocol").value = "origin";
1765-
// E("ss_node_table_naive_protocol").value = "https";
1766-
// E("ss_node_table_naive_user").value = "";
1795+
E("ss_node_table_naive_protocol").value = "https";
1796+
E("ss_node_table_naive_user").value = "";
17671797
E("ss_node_table_rss_protocol_param").value = "";
17681798
E("ss_node_table_rss_obfs").value = "plain";
17691799
E("ss_node_table_rss_obfs_param").value = "";
@@ -1776,10 +1806,13 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
17761806
E("ss_node_table_trojan_binary").value = "Trojan";
17771807
E("ss_node_table_trojan_network").value = "0";
17781808
E("ss_node_table_trojan_sni").value = "";
1779-
// E("ss_node_table_v2ray_network_tlshost").value = "";
1809+
E("ss_node_table_v2ray_network_tlshost").value = "";
1810+
E("ss_node_table_v2ray_network_flow").value = "";
17801811
E("ss_node_table_allowinsecure").value = "0";
17811812
E("ss_node_table_v2ray_mux_enable").value = "0";
1782-
E("ss_node_table_fingerprint").value = "";
1813+
E("ss_node_table_fingerprint").value = "";
1814+
E("ss_node_table_xray_publicKey").value = "";
1815+
E("ss_node_table_xray_shortId").value = "";
17831816
cancel_add_rule();
17841817
}
17851818
}
@@ -2077,7 +2110,8 @@ function edit_conf_table(o) { //编辑节点功能，显示编辑面板
20772110
xray_change_off(c["v2ray_xray"])
20782111
trojan_change_off(c["trojan_binary"])
20792112
network_change_off(c["trojan_network"])
2080-
2113+
flow_change_off(c["v2ray_network"])
2114+
reality_change_off(c["v2ray_network_security"])
20812115
E("cancelBtn").style.display = "";
20822116
E("add_node").style.display = "none";
20832117
E("edit_node").style.display = "";
@@ -2191,8 +2225,8 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
21912225
ns["ssconf_basic_v2ray_headtype_kcp_" + myid] = vmess_node.type;
21922226
}
21932227
ns["ssconf_basic_v2ray_network_host_" + myid] = vmess_node.host;
2194-
// ns["ssconf_basic_v2ray_network_tlshost_" + myid] = vmess_node.tlshost;
2195-
// ns["ssconf_basic_v2ray_network_flow_" + myid] = vmess_node.flow;
2228+
ns["ssconf_basic_v2ray_network_tlshost_" + myid] = vmess_node.tlshost;
2229+
ns["ssconf_basic_v2ray_network_flow_" + myid] = vmess_node.flow;
21962230
ns["ssconf_basic_v2ray_network_path_" + myid] = vmess_node.path;
21972231
if(vmess_node.tls == "tls"){
21982232
ns["ssconf_basic_v2ray_network_security_" + myid] = "tls";
@@ -2242,8 +2276,8 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
22422276
E("ss_node_table_ss_v2ray_plugin").value = "0"
22432277
E("ss_node_table_ss_v2ray_plugin_opts").value = "";
22442278
E("ss_node_table_rss_protocol").value = "origin";
2245-
// E("ss_node_table_naive_protocol").value = "https";
2246-
// E("ss_node_table_naive_user").value = "";
2279+
E("ss_node_table_naive_protocol").value = "https";
2280+
E("ss_node_table_naive_user").value = "";
22472281
E("ss_node_table_rss_protocol_param").value = "";
22482282
E("ss_node_table_rss_obfs").value = "plain";
22492283
E("ss_node_table_rss_obfs_param").value = "";
@@ -2257,9 +2291,12 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
22572291
E("ss_node_table_trojan_network").value = "0";
22582292
E("ss_node_table_trojan_sni").value = "";
22592293
E("ss_node_table_fingerprint").value = "";
2260-
E("ss_node_table_v2ray_network_tlshost").value = "";
2294+
E("ss_node_table_v2ray_network_tlshost").value = "";
2295+
E("ss_node_table_v2ray_network_flow").value = "";
22612296
E("ss_node_table_allowinsecure").value = "0";
22622297
E("ss_node_table_v2ray_mux_enable").value = "0";
2298+
E("ss_node_table_xray_publicKey").value = "";
2299+
E("ss_node_table_xray_shortId").value = "";
22632300
}
22642301
});
22652302
updateSs_node_listView();
@@ -3922,7 +3959,7 @@ function set_cron(action) {
39223959
<tr id="v2ray_network_tr" style="display: none;">
39233960
<th width="35%">传输协议 (network)</th>
39243961
<td>
3925-
<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);">
3962+
<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);">
39263963
<option value="tcp">tcp</option>
39273964
<option value="kcp">kcp</option>
39283965
<option value="ws">ws</option>
@@ -3972,7 +4009,7 @@ function set_cron(action) {
39724009
<tr id="v2ray_network_security_tr" style="display: none;">
39734010
<th width="35%">底层传输安全</th>
39744011
<td>
3975-
<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">
4012+
<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">
39764013
<option value="none">关闭</option>
39774014
<option value="tls">tls</option>
39784015
<option value="xtls">xtls</option>

0 commit comments

Comments
 (0)