Skip to content

Commit

Permalink
v4.37.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@cary-sas
cary-sas committed Mar 25, 2023
1 parent 82e3ad8 commit 1c6fc9f
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 29 deletions.
1 change: 1 addition & 0 deletions 380_armv5_packge/4.37.1/md5sum.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ea82f65ed869e130e227fe229c9eb7ea
Binary file added 380_armv5_packge/4.37.1/shadowsocks.tar.gz
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions 380_armv5_packge/config.json.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"build_date":"2023-01-05_21:11:47",
"build_date":"2023-03-25_20:42:45",
"description":"科学上网",
"home_url":"Main_Ss_Content.asp",
"md5":"10690dfa39f78ea08b977da74e64f7c6",
"md5":"ea82f65ed869e130e227fe229c9eb7ea",
"name":"shadowsocks",
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.0/shadowsocks.tar.gz",
"version":"4.37.0"
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.1/shadowsocks.tar.gz",
"version":"4.37.1"
}
2 changes: 1 addition & 1 deletion 380_armv5_packge/latest.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.37.0
4.37.1
23 changes: 18 additions & 5 deletions shadowsocks/scripts/ss_online_update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ SOCKS_FLAG=0
# ssconf_basic_trojan_binary_
# ssconf_basic_trojan_network_
# ssconf_basic_trojan_sni_
# ssconf_basic_fingerprint_
# ssconf_basic_naive_protocol_
# ssconf_basic_naive_user_
# ==============================

set_lock(){
Expand Down Expand Up @@ -172,6 +175,8 @@ prepare(){
[ -n "$(dbus get ssconf_basic_v2ray_xray_$nu)" ] && echo dbus set ssconf_basic_v2ray_xray_$q=$(dbus get ssconf_basic_v2ray_xray_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_v2ray_network_tlshost_$nu)" ] && echo dbus set ssconf_basic_v2ray_network_tlshost_$q=$(dbus get ssconf_basic_v2ray_network_tlshost_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_v2ray_network_flow_$nu)" ] && echo dbus set ssconf_basic_v2ray_network_flow_$q=$(dbus get ssconf_basic_v2ray_network_flow_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_naive_protocol_$nu)" ] && echo dbus set ssconf_basic_naive_protocol_$q=$(dbus get ssconf_basic_naive_protocol_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_naive_user_$nu)" ] && echo dbus set ssconf_basic_naive_user_$q=$(dbus get ssconf_basic_naive_user_$nu) >> /tmp/ss_conf.sh

echo "#------------------------" >> /tmp/ss_conf.sh
if [ "$nu" == "$ssconf_basic_node" ];then
Expand Down Expand Up @@ -651,7 +656,7 @@ add_vmess_servers(){
[[ $1 -ge 1000 ]] && dbus set ssconf_basic_group_$v2rayindex=$v2ray_group
dbus set ssconf_basic_type_$v2rayindex=3
dbus set ssconf_basic_v2ray_protocol_$v2rayindex="vmess"
dbus set ssconf_basic_v2ray_xray_$v2rayindex="v2ray"
dbus set ssconf_basic_v2ray_xray_$v2rayindex="xray"
[ -n "$v2ray_group" ] && dbus set ssconf_basic_allowinsecure_$v2rayindex=1 || dbus set ssconf_basic_allowinsecure_$v2rayindex=0
dbus set ssconf_basic_v2ray_mux_enable_$v2rayindex=0
dbus set ssconf_basic_v2ray_use_json_$v2rayindex=0
Expand Down Expand Up @@ -1337,7 +1342,9 @@ del_none_exist(){
dbus remove ssconf_basic_v2ray_uuid_$localindex
dbus remove ssconf_basic_v2ray_xray_$localindex
dbus remove ssconf_basic_weight_$localindex

dbus remove ssconf_basic_naive_protocol_$localindex
dbus remove ssconf_basic_naive_user_$localindex

let delnum+=1
fi
done
Expand All @@ -1362,8 +1369,8 @@ remove_node_gap(){
local y=1
for nu in $SEQ
do
[[ $nu -gt 1000 ]] && group_index_node=$((nu/1000*1000))
[ "$y" != "$nu" ] && [[ $nu -gt $group_index_node ]] && [[ $y -lt $group_index_node ]] && y=$((y%1000+group_index_node))
[[ "$nu" -gt 1000 ]] && group_index_node=$((nu/1000*1000))
[[ "$((group_index_node+0))" -gt 0 ]] && [ "$y" != "$nu" ] && [[ "$nu" -gt "$group_index_node" ]] && [[ "$y" -lt "$group_index_node" ]] && y=$((y%1000+group_index_node))
if [ "$y" != "$nu" ] ; then
#echo_date 调整节点 $nu 到 节点 $y !
[ -n "$(dbus get ssconf_basic_group_$nu)" ] && dbus set ssconf_basic_group_"$y"="$(dbus get ssconf_basic_group_$nu)" && dbus remove ssconf_basic_group_$nu
Expand Down Expand Up @@ -1419,7 +1426,9 @@ remove_node_gap(){
[ -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
[ -n "$(dbus get ssconf_basic_v2ray_network_tlshost_$nu)" ] && dbus set ssconf_basic_v2ray_network_tlshost_"$y"="$(dbus get ssconf_basic_v2ray_network_tlshost_$nu)" && dbus remove ssconf_basic_v2ray_network_tlshost_$nu
[ -n "$(dbus get ssconf_basic_v2ray_network_flow_$nu)" ] && dbus set ssconf_basic_v2ray_network_flow_"$y"="$(dbus get ssconf_basic_v2ray_network_flow_$nu)" && dbus remove ssconf_basic_v2ray_network_flow_$nu

[ -n "$(dbus get ssconf_basic_naive_protocol_$nu)" ] && dbus set ssconf_basic_naive_protocol_"$y"="$(dbus get ssconf_basic_naive_protocol_$nu)" && dbus remove ssconf_basic_naive_protocol_$nu
[ -n "$(dbus get ssconf_basic_naive_user_$nu)" ] && dbus set ssconf_basic_naive_user_"$y"="$(dbus get ssconf_basic_naive_user_$nu)" && dbus remove ssconf_basic_naive_user_$nu

usleep 100000
# change node nu
if [ "$nu" == "$ssconf_basic_node" ];then
Expand Down Expand Up @@ -1756,6 +1765,8 @@ start_update(){
dbus remove ssconf_basic_v2ray_uuid_$conf_nu
dbus remove ssconf_basic_v2ray_xray_$conf_nu
dbus remove ssconf_basic_weight_$conf_nu
dbus remove ssconf_basic_naive_protocol_$conf_nu
dbus remove ssconf_basic_naive_user_$conf_nu
done
# 删除不再订阅节点的group信息
confs_nu_2=`dbus list ss_online_group_|grep "$local_group"| cut -d "=" -f 1|cut -d "_" -f 4`
Expand Down Expand Up @@ -1915,6 +1926,8 @@ remove_online(){
dbus remove ssconf_basic_v2ray_uuid_$remove_nu
dbus remove ssconf_basic_v2ray_xray_$remove_nu
dbus remove ssconf_basic_weight_$remove_nu
dbus remove ssconf_basic_naive_protocol_$remove_nu
dbus remove ssconf_basic_naive_user_$remove_nu
done
}

Expand Down
6 changes: 3 additions & 3 deletions shadowsocks/ss/ssconfig.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2044,14 +2044,14 @@ start_v2ray() {
}

start_v2ray_xray() {
if [ "$ss_basic_v2ray_xray" == "xray" ]; then
start_xray
if [ "$ss_basic_v2ray_xray" == "v2ray" ]; then
start_v2ray
elif [ "$ss_basic_type" == "4" ]; then
start_trojan
elif [ "$SS2022" == "Y" ]; then
start_ss2022
else
start_v2ray
start_xray
fi
}

Expand Down
2 changes: 1 addition & 1 deletion shadowsocks/ss/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.37.0
4.37.1
30 changes: 15 additions & 15 deletions shadowsocks/webs/Main_Ss_Content.asp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,9 @@ function save() {
dbus["ssconf_basic_server_" + node_sel] = vmess_node.add;
dbus["ss_basic_port"] = vmess_node.port;
dbus["ssconf_basic_port_" + node_sel] = vmess_node.port;
dbus["ss_basic_v2ray_xray"] = "v2ray";
dbus["ss_basic_v2ray_xray"] = "xray";
dbus["ss_basic_v2ray_protocol"] = "vmess";
dbus["ssconf_basic_v2ray_xray_" + node_sel] = "v2ray";
dbus["ssconf_basic_v2ray_xray_" + node_sel] = "xray";
dbus["ssconf_basic_v2ray_protocol_" + node_sel] = "vmess";
dbus["ss_basic_v2ray_uuid"] = vmess_node.id;
dbus["ssconf_basic_v2ray_uuid_" + node_sel] = vmess_node.id;
Expand Down Expand Up @@ -916,10 +916,10 @@ function ssconf_node2obj(node_sel) {
// $("#use_uuid_on").text("用户id（id）")
// }
var v2ray_xray = db_ss[p + "_" + "v2ray_xray" + "_" + node_sel]
if(v2ray_xray=="xray"){
obj["ss_basic_" + "v2ray_xray"] = "xray"
}else{
if(v2ray_xray=="v2ray"){
obj["ss_basic_" + "v2ray_xray"] = "v2ray"
}else{
obj["ss_basic_" + "v2ray_xray"] = "xray"
}
var trojan_binary = db_ss[p + "_" + "trojan_binary" + "_" + node_sel]
Expand Down Expand Up @@ -971,10 +971,10 @@ function xray_change_on(xy){
//非使用中节点改变
function xray_change_off(xy){
if(xy=="xray"){
E("ss_node_table_v2ray_xray").value = "xray";
}else{
if(xy=="v2ray"){
E("ss_node_table_v2ray_xray").value = "v2ray";
}else{
E("ss_node_table_v2ray_xray").value = "xray";
}
}
function trojan_change_off(xy){
Expand Down Expand Up @@ -1256,7 +1256,7 @@ function Add_profile() { //点击节点页面内添加节点动作
E("edit_node").style.display = "none";
E("continue_add").style.display = "";
E("ss_node_table_v2ray_protocol").value = "vmess";
E("ss_node_table_v2ray_xray").value = "v2ray";
E("ss_node_table_v2ray_xray").value = "xray";
$("#vpnc_settings").fadeIn(200);
$("#use_uuid_off").text("用户id（id）");
$("#v2rayTitle").html("添加V2Ray配置");
Expand Down Expand Up @@ -1670,7 +1670,7 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
ns[p + "_v2ray_security_" + node_global_max] = "auto";
ns[p + "_v2ray_alterid_" + node_global_max] = vmess_node.aid;
ns[p + "_v2ray_protocol_" + node_global_max] = "vmess";
ns[p + "_v2ray_xray_" + node_global_max] = "v2ray";
ns[p + "_v2ray_xray_" + node_global_max] = "xray";
ns[p + "_v2ray_network_" + node_global_max] = vmess_node.net;
if(vmess_node.net == "tcp"){
ns[p + "_v2ray_headtype_tcp_" + node_global_max] = vmess_node.type;
Expand Down Expand Up @@ -1746,7 +1746,7 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
E("ss_node_table_v2ray_uuid").value = "";
E("ss_node_table_v2ray_alterid").value = "";
E("ss_node_table_v2ray_protocol").value = "vmess";
E("ss_node_table_v2ray_xray").value = "v2ray";
E("ss_node_table_v2ray_xray").value = "xray";
E("ss_node_table_v2ray_json").value = "";
E("ss_node_table_trojan_binary").value = "Trojan";
E("ss_node_table_trojan_network").value = "0";
Expand Down Expand Up @@ -2158,7 +2158,7 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
ns["ssconf_basic_v2ray_security_" + myid] = "auto";
ns["ssconf_basic_v2ray_alterid_" + myid] = vmess_node.aid;
ns["ssconf_basic_v2ray_protocol_" + myid] = "vmess";
ns["ssconf_basic_v2ray_xray_" + myid] = "v2ray";
ns["ssconf_basic_v2ray_xray_" + myid] = "xray";
ns["ssconf_basic_v2ray_network_" + myid] = vmess_node.net;
if(vmess_node.net == "tcp"){
ns["ssconf_basic_v2ray_headtype_tcp_" + myid] = vmess_node.type;
Expand Down Expand Up @@ -2226,7 +2226,7 @@ function edit_ss_node_conf(flag) { //编辑节点功能，数据重写
E("ss_node_table_v2ray_uuid").value = "";
E("ss_node_table_v2ray_alterid").value = "";
E("ss_node_table_v2ray_protocol").value = "vmess";
E("ss_node_table_v2ray_xray").value = "v2ray";
E("ss_node_table_v2ray_xray").value = "xray";
E("ss_node_table_v2ray_json").value = "";
E("ss_node_table_trojan_binary").value = "Trojan";
E("ss_node_table_trojan_network").value = "0";
Expand Down Expand Up @@ -3697,8 +3697,8 @@ function set_cron(action) {
<th width="35%">二进制（V2ray/Xray）</th>
<td>
<select id="ss_node_table_v2ray_xray" name="ss_node_table_v2ray_xray" style="width:350px;margin:0px 0px 0px 2px;" class="input_option" onchange="xray_change_off(this.value);">
<option value="v2ray">V2ray</option>
<option value="xray">Xray</option>
<option value="v2ray">V2ray</option>
</select>
</td>
</tr>
Expand Down Expand Up @@ -4090,8 +4090,8 @@ function set_cron(action) {
</th>
<td>
<select id="ss_basic_v2ray_xray" name="ss_basic_v2ray_xray" style="width:164px;margin:0px 0px 0px 2px;" class="input_option" onchange="xray_change_on(this.value);">
<option value="v2ray">V2ray</option>
<option value="xray">Xray</option>
<option value="v2ray">V2ray</option>
</select>
</td>
</tr>
Expand Down

0 comments on commit 1c6fc9f

Please sign in to comment.