Skip to content

Commit dd4dee2

Browse files
cary-sascary-sas
committed
v4.37.0
1 parent 46eaa3a commit dd4dee2

File tree

10 files changed

+56
-26
lines changed

10 files changed

+56
-26
lines changed

‎380_armv5_packge/4.37.0/md5sum.txt‎

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

‎380_armv5_packge/4.37.0/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":"2022-12-31_16:31:31",
2+
"build_date":"2023-01-05_21:11:47",
33
"description":"科学上网",
44
"home_url":"Main_Ss_Content.asp",
5-
"md5":"6bf3c531178e03d5cb6d88860d0ae3f3",
5+
"md5":"10690dfa39f78ea08b977da74e64f7c6",
66
"name":"shadowsocks",
7-
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.9/shadowsocks.tar.gz",
8-
"version":"4.36.9"
7+
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.0/shadowsocks.tar.gz",
8+
"version":"4.37.0"
99
}

‎380_armv5_packge/latest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.36.9
1+
4.37.0

‎shadowsocks/bin/xray‎

716 KB
Binary file not shown.

‎shadowsocks/scripts/ss_online_update.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ add_vless_servers(){
10001000
# tcp协议设置【 tcp伪装类型 (type)】和【tls/xtls域名 (SNI)】
10011001
# tcp + xtls 会比较多，别的组合不熟悉
10021002
dbus set ssconf_basic_v2ray_headtype_tcp_$v2rayindex="$v2ray_type"
1003-
[ "$v2ray_tls" = "xtls" ] && dbus set ssconf_basic_v2ray_network_flow_$v2rayindex=$v2ray_flow
1003+
[ "${v2ray_tls#*x}" = "tls" ] && dbus set ssconf_basic_v2ray_network_flow_$v2rayindex=$v2ray_flow
10041004

10051005
# @@ 不确定这个变量是否需要添加
10061006
# [ -n "$v2ray_host" ] && dbus set ssconf_basic_v2ray_network_host_$v2rayindex=$v2ray_host

‎shadowsocks/scripts/ss_webtest.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ rm -f /tmp/tmp_v2ray.json
103103
\"allowInsecure\": $(get_function_switch $(eval echo \$ssconf_basic_allowinsecure_$nu)),
104104
\"serverName\": \"$(eval echo \$ssconf_basic_v2ray_network_tlshost_$nu)\"
105105
}"
106+
[ "$(eval echo \$ssconf_basic_v2ray_network_flow_$nu)" != "none" -a "$(eval echo \$ssconf_basic_v2ray_network_flow_$nu)" != "" ] && local vless_flow="\"flow\": \"$(eval echo \$ssconf_basic_v2ray_network_flow_$nu)\"," || local vless_flow=""
106107
;;
107108
xtls)
108109
local xtls="{

‎shadowsocks/ss/ssconfig.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,7 @@ create_v2ray_json(){
13751375
\"allowInsecure\": $(get_function_switch $ss_basic_allowinsecure),
13761376
\"serverName\": \"$ss_basic_v2ray_network_tlshost\"
13771377
}"
1378+
[ "$ss_basic_v2ray_network_flow" != "none" -a "$ss_basic_v2ray_network_flow" != "" ] && local vless_flow="\"flow\": \"$ss_basic_v2ray_network_flow\"," || local vless_flow=""
13781379
;;
13791380
xtls)
13801381
local xtls="{

‎shadowsocks/ss/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.36.9
1+
4.37.0

‎shadowsocks/webs/Main_Ss_Content.asp‎

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,8 @@ function verifyFields(r) {
610610
var path_on = E("ss_basic_v2ray_network").value == "ws" || E("ss_basic_v2ray_network").value == "h2" || E("ss_basic_trojan_network").value == "1" || E("ss_basic_v2ray_network").value == "kcp";
611611
var tls_on = E("ss_basic_v2ray_network_security").value == "xtls" || E("ss_basic_v2ray_network_security").value == "tls";
612612
var xtls_on = E("ss_basic_v2ray_network_security").value == "xtls";
613+
var vision_on = E("ss_basic_v2ray_protocol").value == "vless" && E("ss_basic_v2ray_network").value == "tcp" && E("ss_basic_v2ray_network_security").value == "tls";
614+
613615
showhide("pass_tr", (!v2ray_on));
614616
showhide("method_tr", (!v2ray_on) && (!trojan_on) && (!naive_on));
615617
showhide("server_tr", (json_off));
@@ -627,7 +629,10 @@ function verifyFields(r) {
627629
showhide("v2ray_network_host_basic_tr", ((v2ray_on && json_off && host_on) || (trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go" && host_on)));
628630
showhide("v2ray_network_path_basic_tr", ((v2ray_on && json_off && path_on) || (trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go" && path_on)));
629631
showhide("v2ray_network_tlshost_basic_tr", (v2ray_on && json_off && tls_on));
630-
showhide("v2ray_network_flow_basic_tr", (v2ray_on && json_off && xtls_on));
632+
showhide("v2ray_network_flow_basic_tr", (v2ray_on && json_off && (xtls_on || vision_on)));
633+
showhide("xtls_flow_opt_basic" , (v2ray_on && json_off && xtls_on));
634+
showhide("vision_flow_opt_basic" , (v2ray_on && json_off && vision_on));
635+
631636
showhide("v2ray_network_security_basic_tr", (v2ray_on && json_off));
632637
showhide("v2ray_mux_enable_basic_tr", ((trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go")|| (v2ray_on && json_off)));
633638
showhide("v2ray_mux_concurrency_basic_tr", (((trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go") || (v2ray_on && json_off)) && E("ss_basic_v2ray_mux_enable").checked));
@@ -725,13 +730,17 @@ function verifyFields(r) {
725730
var path_on_2 = E("ss_node_table_v2ray_network").value == "ws" || E("ss_node_table_v2ray_network").value == "h2" || E("ss_node_table_v2ray_network").value == "kcp" ;
726731
var tls_on_2 = E("ss_node_table_v2ray_network_security").value == "tls" || E("ss_node_table_v2ray_network_security").value == "xtls";
727732
var xtls_on_2 = E("ss_node_table_v2ray_network_security").value == "xtls";
733+
var vision_on_2 = E("ss_node_table_v2ray_protocol").value == "vless" && E("ss_node_table_v2ray_network").value == "tcp" && E("ss_node_table_v2ray_network_security").value == "tls";
734+
728735
showhide("v2ray_headtype_tcp_tr", (E("ss_node_table_v2ray_network").value == "tcp"));
729736
showhide("v2ray_headtype_kcp_tr", (E("ss_node_table_v2ray_network").value == "kcp"));
730737
showhide("v2ray_serviceName_tr", serviceName_on_2);
731738
showhide("v2ray_network_host_tr", host_on_2);
732739
showhide("v2ray_network_tlshost_tr", tls_on_2);
733740
showhide("allowinsecure_tr", tls_on_2);
734-
showhide("v2ray_network_flow_tr", xtls_on_2);
741+
showhide("v2ray_network_flow_tr", xtls_on_2 || vision_on_2);
742+
showhide("xtls_flow_opt" , xtls_on_2);
743+
showhide("vision_flow_opt" , vision_on_2);
735744
showhide("v2ray_network_path_tr", path_on_2);
736745
showhide("v2ray_mux_concurrency_tr", (E("ss_node_table_v2ray_mux_enable").checked));
737746
showhide("v2ray_json_tr", (E("ss_node_table_v2ray_use_json").checked));
@@ -1497,15 +1506,19 @@ function tabclickhandler(_type) {
14971506
var host_on_2 = E("ss_node_table_v2ray_network").value == "ws" || E("ss_node_table_v2ray_network").value == "h2" || http_on_2;
14981507
var serviceName_on_2 = E("ss_node_table_v2ray_network").value == "grpc";
14991508
var path_on_2 = E("ss_node_table_v2ray_network").value == "ws" || E("ss_node_table_v2ray_network").value == "h2" || E("ss_node_table_v2ray_network").value == "kcp";
1500-
var tlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "tls" || E("ss_node_table_v2ray_network_security").value == "xtls"
1501-
var xtlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "xtls"
1509+
var tlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "tls" || E("ss_node_table_v2ray_network_security").value == "xtls";
1510+
var xtlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "xtls";
1511+
var visionhost_on_2 = E("ss_node_table_v2ray_protocol").value == "vless" && E("ss_node_table_v2ray_network").value == "tcp" && E("ss_node_table_v2ray_network_security").value == "tls";
15021512
showhide("v2ray_headtype_tcp_tr", (E("ss_node_table_v2ray_network").value == "tcp"));
15031513
showhide("v2ray_headtype_kcp_tr", (E("ss_node_table_v2ray_network").value == "kcp"));
15041514
showhide("v2ray_network_host_tr", host_on_2);
15051515
showhide("v2ray_serviceName_tr", serviceName_on_2);
15061516
showhide("v2ray_network_path_tr", path_on_2);
15071517
showhide("v2ray_network_tlshost_tr", tlshost_on_2);
1508-
showhide("v2ray_network_flow_tr", xtlshost_on_2);
1518+
showhide("v2ray_network_flow_tr", xtlshost_on_2 || visionhost_on_2 );
1519+
showhide("xtls_flow_opt", xtlshost_on_2 );
1520+
showhide("vision_flow_opt", visionhost_on_2 );
1521+
15091522
showhide("allowinsecure_tr", (xtlshost_on_2 || tlshost_on_2 ));
15101523
showhide("v2ray_mux_concurrency_tr", (E("ss_node_table_v2ray_mux_enable").checked));
15111524
showhide("v2ray_json_tr", (E("ss_node_table_v2ray_use_json").checked));
@@ -3945,12 +3958,19 @@ function set_cron(action) {
39453958
<th width="35%">流控 (flow)</th>
39463959
<td>
39473960
<select id="ss_node_table_v2ray_network_flow" name="ss_node_table_v2ray_network_flow" onchange="verifyFields(this, 1);" style="width:350px;margin:0px 0px 0px 2px;" class="input_option">
3948-
<option value="xtls-rprx-direct">xtls-rprx-direct</option>
3949-
<option value="xtls-rprx-splice">xtls-rprx-splice</option>
3950-
<option value="xtls-rprx-origin">xtls-rprx-origin</option>
3951-
<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
3952-
<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
3953-
<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
3961+
<option value=""></option>
3962+
<optgroup label="xtls" id="xtls_flow_opt">
3963+
<option value="xtls-rprx-direct">xtls-rprx-direct</option>
3964+
<option value="xtls-rprx-splice">xtls-rprx-splice</option>
3965+
<option value="xtls-rprx-origin">xtls-rprx-origin</option>
3966+
<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
3967+
<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
3968+
<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
3969+
</optgroup>
3970+
<optgroup label="xtls-vision" id="vision_flow_opt">
3971+
<option value="xtls-rprx-vision">xtls-rprx-vision</option>
3972+
<option value="xtls-rprx-vision-udp443">xtls-rprx-vision-udp443</option>
3973+
</optgroup>
39543974
</select>
39553975
</td>
39563976
</tr>
@@ -3992,7 +4012,7 @@ function set_cron(action) {
39924012
<th width="35%">指纹 (fingerprint)</th>
39934013
<td>
39944014
<select id="ss_node_table_fingerprint" name="ss_node_table_fingerprint" onchange="verifyFields(this, 1);" style="width:350px;margin:0px 0px 0px 2px;" class="input_option">
3995-
<option value="none" selected>关闭</option>
4015+
<option value="none">关闭</option>
39964016
<option value="firefox">firefox</option>
39974017
<option value="chrome">chrome</option>
39984018
<option value="ios">ios</option>
@@ -4353,12 +4373,19 @@ function set_cron(action) {
43534373
</th>
43544374
<td>
43554375
<select id="ss_basic_v2ray_network_flow" name="ss_basic_v2ray_network_flow" onchange="verifyFields(this, 1);" style="width:164px;margin:0px 0px 0px 2px;" class="input_option">
4356-
<option value="xtls-rprx-direct">xtls-rprx-direct</option>
4357-
<option value="xtls-rprx-splice">xtls-rprx-splice</option>
4358-
<option value="xtls-rprx-origin">xtls-rprx-origin</option>
4359-
<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
4360-
<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
4361-
<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
4376+
<option value=""></option>
4377+
<optgroup label="xtls" id="xtls_flow_opt_basic">
4378+
<option value="xtls-rprx-direct">xtls-rprx-direct</option>
4379+
<option value="xtls-rprx-splice">xtls-rprx-splice</option>
4380+
<option value="xtls-rprx-origin">xtls-rprx-origin</option>
4381+
<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
4382+
<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
4383+
<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
4384+
</optgroup>
4385+
<optgroup label="xtls-vision" id="vision_flow_opt_basic">
4386+
<option value="xtls-rprx-vision">xtls-rprx-vision</option>
4387+
<option value="xtls-rprx-vision-udp443">xtls-rprx-vision-udp443</option>
4388+
</optgroup>
43624389
</select>
43634390
</td>
43644391
</tr>
@@ -4405,7 +4432,7 @@ function set_cron(action) {
44054432
<th width="35%">指纹 (fingerprint)</th>
44064433
<td>
44074434
<select id="ss_basic_fingerprint" name="ss_basic_fingerprint" onchange="verifyFields(this, 1);" style="width:164px;margin:0px 0px 0px 2px;" class="input_option">
4408-
<option value="none" selected>关闭</option>
4435+
<option value="none">关闭</option>
44094436
<option value="firefox">firefox</option>
44104437
<option value="chrome">chrome</option>
44114438
<option value="ios">ios</option>

0 commit comments

Comments
 (0)