Skip to content

Commit da6d039

Browse files
cary-sascary-sas
committed
v4.36.8
1 parent 37b9f14 commit da6d039

File tree

12 files changed

+193
-13
lines changed

12 files changed

+193
-13
lines changed

Diff for: ‎380_armv5_packge/4.36.8/md5sum.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fdc70591e739a101442120a193f14771

Diff for: ‎380_armv5_packge/4.36.8/shadowsocks.tar.gz

25.9 MB
Binary file not shown.

Diff for: ‎380_armv5_packge/config.json.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"build_date":"2022-11-24_00:28:51",
2+
"build_date":"2022-12-12_22:11:46",
33
"description":"科学上网",
44
"home_url":"Main_Ss_Content.asp",
5-
"md5":"c1fbaa4a04a4676006dd080d707e8dfd",
5+
"md5":"fdc70591e739a101442120a193f14771",
66
"name":"shadowsocks",
7-
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.7/shadowsocks.tar.gz",
8-
"version":"4.36.7"
7+
"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.8/shadowsocks.tar.gz",
8+
"version":"4.36.8"
99
}

Diff for: ‎380_armv5_packge/latest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.36.7
1+
4.36.8

Diff for: ‎shadowsocks/bin/naive

21.2 KB
Binary file not shown.

Diff for: ‎shadowsocks/bin/trojan-go

74.6 KB
Binary file not shown.

Diff for: ‎shadowsocks/bin/xray

782 KB
Binary file not shown.

Diff for: ‎shadowsocks/scripts/ss_proc_status.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ echo_version(){
119119
echo "client_linux_arm5 20210922 kcptun"
120120
echo "v2ray $ss_basic_v2ray_version "
121121
echo "xray $ss_basic_xray_version "
122-
echo "trojan-go 0.10.9 2022年10月18日编译"
122+
echo "trojan-go 0.10.10 2022年11月29日编译"
123123
echo "naive $ss_basic_naive_version "
124124
echo -----------------------------------------------------------
125125
}

Diff for: ‎shadowsocks/scripts/ss_webtest.sh

+73-2
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,59 @@ create_naive_json(){
520520
EOF
521521
}
522522

523+
create_ss2022_json(){
524+
rm -f /tmp/tmp_v2ray.json
525+
#Shadowsocks 2022
526+
# inbounds area (23458 for socks5)
527+
cat > /tmp/tmp_v2ray.json <<-EOF
528+
{
529+
"log": {
530+
"access": "/dev/null",
531+
"error": "/tmp/v2ray_webtest_log.log",
532+
"loglevel": "error"
533+
},
534+
"inbounds": [
535+
{
536+
"port": 23458,
537+
"listen": "0.0.0.0",
538+
"protocol": "socks",
539+
"settings": {
540+
"auth": "noauth",
541+
"udp": true,
542+
"ip": "127.0.0.1",
543+
"clients": null
544+
},
545+
"streamSettings": null
546+
},
547+
{
548+
"listen": "0.0.0.0",
549+
"port": 3335,
550+
"protocol": "dokodemo-door",
551+
"settings": {
552+
"network": "tcp,udp",
553+
"followRedirect": true
554+
}
555+
}
556+
],
557+
"outbounds": [
558+
{
559+
"protocol": "shadowsocks",
560+
"settings": {
561+
"servers": [
562+
{
563+
"address": "$array1",
564+
"port": $array2,
565+
"method": "$array4",
566+
"password": "$array3"
567+
}
568+
]
569+
}
570+
}
571+
]
572+
}
573+
EOF
574+
}
575+
523576
start_webtest(){
524577
array1=`dbus get ssconf_basic_server_$nu`
525578
array2=`dbus get ssconf_basic_port_$nu`
@@ -537,6 +590,17 @@ start_webtest(){
537590
array14=`dbus get ssconf_basic_trojan_binary_$nu`
538591
array15=`dbus get ssconf_basic_naive_protocol_$nu`
539592
array16=`dbus get ssconf_basic_naive_user_$nu`
593+
array17=`dbus get ssconf_basic_v2ray_xray_$nu`
594+
595+
if [ "$array12" == "0" ];then
596+
case $array4 in
597+
2022-blake3-aes-128-gcm|2022-blake3-aes-256-gcm|2022-blake3-chacha20-poly1305) SS2022_webtest="Y";;
598+
*) SS2022_webtest="N";;
599+
esac
600+
fi
601+
[ "$SS2022_webtest" == "Y" ] && array12="3"
602+
603+
[ "$array17" == "xray" ] && array17="xray run"
540604

541605
if [ "$array10" != "" ];then
542606
if [ "$array9" == "1" ];then
@@ -587,13 +651,20 @@ start_webtest(){
587651
fi
588652
kill -9 $ss_local_pid >/dev/null 2>&1
589653

590-
elif [ "$array12" == "3" ];then #v2ray
654+
elif [ "$array12" == "3" ] && [ "$SS2022_webtest" != "Y" ];then #v2ray
591655
create_v2ray_json
656+
$array17 -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &
657+
speed_test_curl
658+
kill -9 `ps|grep "$array17" |grep 'tmp_v2ray'|awk '{print $1}'` >/dev/null 2>&1
659+
rm -f /tmp/tmp_v2ray.json /tmp/v2ray_webtest_log.log
660+
661+
elif [ "$array12" == "3" ] && [ "$SS2022_webtest" == "Y" ];then #ShadowSocks 2022
662+
create_ss2022_json
592663
xray run -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &
593664
speed_test_curl
594665
kill -9 `ps|grep xray|grep 'tmp_v2ray'|awk '{print $1}'` >/dev/null 2>&1
595666
rm -f /tmp/tmp_v2ray.json /tmp/v2ray_webtest_log.log
596-
667+
597668
elif [ "$array12" == "4" -a "$array14" == "Trojan" ];then #trojan
598669
create_trojan_json
599670
xray run -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &

Diff for: ‎shadowsocks/ss/ssconfig.sh

+106-4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ game_on=`dbus list ss_acl_mode|cut -d "=" -f 2 | grep 3`
3535
ss_basic_password=`echo $ss_basic_password|base64_decode`
3636
ARG_V2RAY_PLUGIN=""
3737

38+
if [ "$ss_basic_type" == "0" ];then
39+
case $ss_basic_method in
40+
2022-blake3-aes-128-gcm|2022-blake3-aes-256-gcm|2022-blake3-chacha20-poly1305) SS2022="Y";;
41+
*) SS2022="N";;
42+
esac
43+
fi
44+
[ "$SS2022" == "Y" ] && ss_basic_type="3"
45+
3846
# 兼容3.8.9及其以下
3947
[ -z "$ss_basic_type" ] && {
4048
if [ -n "$ss_basic_rss_protocol" ];then
@@ -1776,7 +1784,6 @@ create_trojan_json(){
17761784
EOF
17771785

17781786
echo_date 解析Trojan配置文件...
1779-
# cp "$V2RAY_CONFIG_FILE_TMP" /tmp/home/root/trojantmp.json
17801787
cat "$V2RAY_CONFIG_FILE_TMP" | jq --tab . >"$V2RAY_CONFIG_FILE"
17811788

17821789
echo_date Trojan配置文件写入成功到"$V2RAY_CONFIG_FILE"
@@ -1937,6 +1944,82 @@ create_naive_json(){
19371944
fi
19381945
}
19391946

1947+
1948+
create_ss2022_json(){
1949+
rm -rf "$V2RAY_CONFIG_FILE_TMP"
1950+
rm -rf "$V2RAY_CONFIG_FILE"
1951+
if [ "$ss_basic_type" == "3" ] && [ "$SS2022" == "Y" ]; then
1952+
echo_date 生成 Shadowsocks 2022 配置文件...
1953+
#Shadowsocks 2022
1954+
# inbounds area (23456 for socks5)
1955+
cat >"$V2RAY_CONFIG_FILE_TMP" <<-EOF
1956+
{
1957+
"log": {
1958+
"access": "/dev/null",
1959+
"error": "/tmp/v2ray_log.log",
1960+
"loglevel": "error"
1961+
},
1962+
"inbounds": [
1963+
{
1964+
"port": 23456,
1965+
"listen": "0.0.0.0",
1966+
"protocol": "socks",
1967+
"settings": {
1968+
"auth": "noauth",
1969+
"udp": true,
1970+
"ip": "127.0.0.1",
1971+
"clients": null
1972+
},
1973+
"streamSettings": null
1974+
},
1975+
{
1976+
"listen": "0.0.0.0",
1977+
"port": 3333,
1978+
"protocol": "dokodemo-door",
1979+
"settings": {
1980+
"network": "tcp,udp",
1981+
"followRedirect": true
1982+
}
1983+
}
1984+
],
1985+
"outbounds": [
1986+
{
1987+
"protocol": "shadowsocks",
1988+
"settings": {
1989+
"servers": [
1990+
{
1991+
"address": "$(dbus get ss_basic_server)",
1992+
"port": $ss_basic_port,
1993+
"method": "$ss_basic_method",
1994+
"password": "$ss_basic_password"
1995+
}
1996+
]
1997+
}
1998+
}
1999+
]
2000+
}
2001+
EOF
2002+
2003+
echo_date 解析 Shadowsocks 2022 配置文件...
2004+
cat "$V2RAY_CONFIG_FILE_TMP" | jq --tab . >"$V2RAY_CONFIG_FILE"
2005+
2006+
echo_date Shadowsocks 2022 配置文件写入成功到"$V2RAY_CONFIG_FILE"
2007+
2008+
cd /koolshare/bin
2009+
echo_date 测试 Shadowsocks 2022 配置文件.....
2010+
result=$(xray -test -config="$V2RAY_CONFIG_FILE" | grep "Configuration OK.")
2011+
if [ -n "$result" ]; then
2012+
echo_date $result
2013+
echo_date Shadowsocks 2022 配置文件通过测试!!!
2014+
else
2015+
echo_date Shadowsocks 2022 配置文件没有通过测试，请检查设置!!!
2016+
rm -rf "$V2RAY_CONFIG_FILE_TMP"
2017+
rm -rf "$V2RAY_CONFIG_FILE"
2018+
close_in_five
2019+
fi
2020+
fi
2021+
}
2022+
19402023
start_v2ray() {
19412024
# v2ray start
19422025
cd /koolshare/bin
@@ -1961,11 +2044,11 @@ start_v2ray_xray() {
19612044
start_xray
19622045
elif [ "$ss_basic_type" == "4" ]; then
19632046
start_trojan
2047+
elif [ "$SS2022" == "Y" ]; then
2048+
start_ss2022
19642049
else
19652050
start_v2ray
19662051
fi
1967-
1968-
19692052
}
19702053

19712054
start_xray() {
@@ -2042,6 +2125,24 @@ start_naiveproxy() {
20422125
echo_date NaiveProxy启动成功，pid：$naivePID
20432126
}
20442127

2128+
start_ss2022() {
2129+
# Shadowsocks 2022 start
2130+
cd /koolshare/bin
2131+
#export GOGC=30
2132+
xray run -config=/koolshare/ss/v2ray.json >/dev/null 2>&1 &
2133+
local ss2022PID
2134+
local i=10
2135+
until [ -n "$ss2022PID" ]; do
2136+
i=$(($i - 1))
2137+
ss2022PID=$(pidof xray)
2138+
if [ "$i" -lt 1 ]; then
2139+
echo_date "Shadowsocks 2022 进程启动失败！"
2140+
close_in_five
2141+
fi
2142+
sleep 1
2143+
done
2144+
echo_date Shadowsocks 2022 启动成功，pid：$ss2022PID
2145+
}
20452146

20462147
write_cron_job(){
20472148
sed -i '/ssupdate/d' /var/spool/cron/crontabs/* >/dev/null 2>&1
@@ -2708,7 +2809,8 @@ apply_ss(){
27082809
create_dnsmasq_conf
27092810
# do not re generate json on router start, use old one
27102811
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" != "3" ] && [ "$ss_basic_type" != "4" ] && create_ss_json
2711-
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "3" ] && create_v2ray_json
2812+
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "3" ] && [ "$SS2022" != "Y" ] && create_v2ray_json
2813+
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "3" ] && [ "$SS2022" == "Y" ] && create_ss2022_json
27122814
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "4" -a "$ss_basic_trojan_binary" == "Trojan" ] && create_trojan_json
27132815
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "4" -a "$ss_basic_trojan_binary" == "Trojan-Go" ] && create_trojango_json
27142816
[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "5" ] && create_naive_json

Diff for: ‎shadowsocks/ss/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.36.7
1+
4.36.8

Diff for: ‎shadowsocks/webs/Main_Ss_Content.asp

+6
Original file line numberDiff line numberDiff line change
@@ -3771,6 +3771,9 @@ function set_cron(action) {
37713771
<option value="chacha20-ietf">chacha20-ietf</option>
37723772
<option value="chacha20-ietf-poly1305">chacha20-ietf-poly1305</option>
37733773
<option value="xchacha20-ietf-poly1305">xchacha20-ietf-poly1305</option>
3774+
<option value="2022-blake3-aes-128-gcm">2022-blake3-aes-128-gcm</option>
3775+
<option value="2022-blake3-aes-256-gcm">2022-blake3-aes-256-gcm</option>
3776+
<option value="2022-blake3-chacha20-poly1305">2022-blake3-chacha20-poly1305</option>
37743777
</select>
37753778
</td>
37763779
</tr>
@@ -4129,6 +4132,9 @@ function set_cron(action) {
41294132
<option value="chacha20-ietf">chacha20-ietf</option>
41304133
<option value="chacha20-ietf-poly1305">chacha20-ietf-poly1305</option>
41314134
<option value="xchacha20-ietf-poly1305">xchacha20-ietf-poly1305</option>
4135+
<option value="2022-blake3-aes-128-gcm">2022-blake3-aes-128-gcm</option>
4136+
<option value="2022-blake3-aes-256-gcm">2022-blake3-aes-256-gcm</option>
4137+
<option value="2022-blake3-chacha20-poly1305">2022-blake3-chacha20-poly1305</option>
41324138
</select>
41334139
</td>
41344140
</tr>

0 commit comments

Comments
 (0)