Skip to content

Commit

Permalink
v4.34.4
Browse files Browse the repository at this point in the history
  • Loading branch information
cary-sas committed Mar 26, 2021
1 parent 66d844e commit 4087347
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 87 deletions.
1 change: 1 addition & 0 deletions 380_armv5_packge/4.34.4/md5sum.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c8320a7ec91863ad89ef2c09a7172a5f
Binary file added 380_armv5_packge/4.34.4/shadowsocks.tar.gz
View file
Binary file not shown.
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.34.3
4.34.4
Binary file modified shadowsocks/bin/v2ctl
View file
Binary file not shown.
Binary file modified shadowsocks/bin/v2ray
View file
Binary file not shown.
Binary file modified shadowsocks/bin/xray
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions shadowsocks/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ dbus set softcenter_module_shadowsocks_description="科学上网 for merlin armv
dbus set softcenter_module_shadowsocks_home_url="Main_Ss_Content.asp"

# 设置v2ray 版本号
dbus set ss_basic_v2ray_version=4.34.3
dbus set ss_basic_v2ray_date=20210317
dbus set ss_basic_v2ray_version=4.34.4
dbus set ss_basic_v2ray_date=20210326

echo_date 一点点清理工作...
rm -rf /tmp/shadowsocks* >/dev/null 2>&1
Expand Down
114 changes: 35 additions & 79 deletions shadowsocks/scripts/ss_online_update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ SOCKS_FLAG=0
# ssconf_basic_mode_
# ssconf_basic_name_
# ssconf_basic_password_
# ssconf_basic_ss_obfs_
# ssconf_basic_ss_obfs_host_
# ssconf_basic_ss_v2ray_
# ssconf_basic_ss_kcp_support_
# ssconf_basic_ss_udp_support_
Expand Down Expand Up @@ -124,8 +122,6 @@ prepare(){
[ -n "$(dbus get ssconf_basic_name_$nu)" ] && echo dbus set ssconf_basic_name_$q=$(dbus get ssconf_basic_name_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_password_$nu)" ] && echo dbus set ssconf_basic_password_$q=$(dbus get ssconf_basic_password_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_port_$nu)" ] && echo dbus set ssconf_basic_port_$q=$(dbus get ssconf_basic_port_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_ss_obfs_$nu)" ] && echo dbus set ssconf_basic_ss_obfs_$q=$(dbus get ssconf_basic_ss_obfs_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_ss_obfs_host_$nu)" ] && echo dbus set ssconf_basic_ss_obfs_host_$q=$(dbus get ssconf_basic_ss_obfs_host_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_ss_v2ray_$nu)" ] && echo dbus set ssconf_basic_ss_v2ray_$q=$(dbus get ssconf_basic_ss_v2ray_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_ss_kcp_support_$nu)" ] && echo dbus set ssconf_basic_ss_kcp_support_$q=$(dbus get ssconf_basic_ss_kcp_support_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_ss_udp_support_$nu)" ] && echo dbus set ssconf_basic_ss_udp_support_$q=$(dbus get ssconf_basic_ss_udp_support_$nu) >> /tmp/ss_conf.sh
Expand Down Expand Up @@ -225,10 +221,9 @@ add_ss_servers(){
dbus set ssconf_basic_method_$ss_index=$encrypt_method
dbus set ssconf_basic_password_$ss_index=$password
dbus set ssconf_basic_type_$ss_index="0"
dbus set ssconf_basic_ss_obfs_$ss_index=$ss_obfs_tmp
dbus set ssconf_basic_ss_obfs_host_$ss_index=$ss_obfs_host
dbus set ssconf_basic_ss_v2ray_$ss_index=$ss_v2ray_tmp
dbus set ssconf_basic_ss_v2ray_plugin_$ss_index=$ss_v2ray_plugin_tmp
dbus set ssconf_basic_ss_v2ray_plugin_opts_$ss_index=$ss_v2ray_opts_tmp
dbus set ssconf_basic_ss_kcp_support_$ss_index=$ss_kcp_support_tmp
dbus set ssconf_basic_ss_udp_support_$ss_index=$ss_udp_support_tmp
dbus set ssconf_basic_ss_kcp_opts_$ss_index=$ss_kcp_opts_tmp
Expand All @@ -243,12 +238,10 @@ add_ss_servers(){

#初始化
encrypt_method=""
ss_obfs_tmp="0"
ss_v2ray_tmp="0"
ss_v2ray_opts_tmp=""
ss_kcp_support_tmp="0"
ss_udp_support_tmp="0"
ss_obfs_host=""
ss_kcp_opts_tmp=""
ss_sskcp_server_tmp=""
ss_sskcp_port_tmp=""
Expand Down Expand Up @@ -277,8 +270,8 @@ get_ss_config(){

if [ -n "$(echo -n "$decode_link" | awk -F'#' '{print $1}' | grep '@')" ];then
paraminfo=$(base64decode_link `echo -n "$decode_link" | awk -F'@' '{print $1}'`)
server=$(echo "$decode_link" |awk -F'[@#]' '{print $2}'| awk -F':' '{print $1}')
server_port=$(echo "$decode_link" |awk -F'[@#]' '{print $2}'| awk -F':' '{print $2}')
server=$(echo "$decode_link" |awk -F'[@?#]' '{print $2}'| awk -F':' '{print $1}')
server_port=$(echo "$decode_link" |awk -F'[@?#]' '{print $2}'| awk -F':' '{print $2}')
encrypt_method=$(echo "$paraminfo" |awk -F':' '{print $1}')
password=$(echo "$paraminfo" |awk -F':' '{print $2}')
password=$(echo $password | base64_encode)
Expand All @@ -294,57 +287,31 @@ get_ss_config(){
password=$(echo $password | base64_encode)
fi

#参数获值
if [ -n "$(echo -n "$paraminfo" | grep "?")" ];then
plugin=$(echo "$paraminfo" |awk -F'?' '{print $2}')
#去掉无plugin但是有group=造成误取值

plugin=$(echo "$plugin" |awk -F'group' '{print $1}')
#plugin=obfs-local;obfs=tls;obfs-host=bebca9215.wns.windows.com&

if [ -n "$plugin" ];then
#ss_obfs_tmp=tls;obfs-host=bebc5.wns.windows.com&group=RGxlciBDbG91ZA
#ss_obfs_tmp=$(echo "$plugin" | awk -F'obfs=' '{print $2}')

#ss_obfs_tmp=tls
ss_obfs_tmp=$(echo "$plugin" | awk -F'obfs=' '{print $2}' | awk -F';' '{print $1}')
case "$ss_obfs_tmp" in
tls)
ss_obfs_host=$(echo "$plugin" | awk -F'obfs=' '{print $2}' | awk -F';' '{print $2}' | awk -F'&' '{print $1}' | awk -F'obfs-host=' '{print $2}')
ss_v2ray_tmp="0"
ss_v2ray_opts_tmp=""
ss_kcp_support_tmp="0"
ss_udp_support_tmp="0"
ss_kcp_opts_tmp=""
ss_sskcp_server_tmp=""
ss_sskcp_port_tmp=""
ss_ssudp_server_tmp=""
ss_ssudp_port_tmp=""
ss_ssudp_mtu_tmp=""
ss_udp_opts_tmp=""
;;
http)
ss_obfs_host=$(echo "$plugin" | awk -F'obfs=' '{print $2}' | awk -F';' '{print $2}' | awk -F'&' '{print $1}' | awk -F'obfs-host=' '{print $2}')
ss_v2ray_tmp="0"
ss_v2ray_opts_tmp=""
ss_kcp_support_tmp="0"
ss_udp_support_tmp="0"
ss_kcp_opts_tmp=""
ss_sskcp_server_tmp=""
ss_sskcp_port_tmp=""
ss_ssudp_server_tmp=""
ss_ssudp_port_tmp=""
ss_ssudp_mtu_tmp=""
ss_udp_opts_tmp=""
;;
kcp)

;;
esac
else
ss_obfs_tmp="0"
#v2ray plugin : simple obfs will not be supported anymore, v2ray plugin will replace it
# link format example
# plugin=v2ray;path=/s233;host=yes.herokuapp.com;tls

if [ -n "$(echo -n "$decode_link" | grep "?")" ];then
plugin=$(echo "$decode_link" |awk -F'?' '{print $2}')
plugin_type=$(echo "$plugin" | tr ';' '\n' | grep 'plugin=' | awk -F'=' '{print $2}')

if [ -n "$plugin" ] && [ "$plugin_type" == "v2ray" ];then
ss_v2ray_tmp="1"
ss_v2ray_opts_tmp="$(echo $plugin | cut -d";" -f2-)"
ss_v2ray_plugin_tmp="1"
ss_kcp_support_tmp="0"
ss_udp_support_tmp="0"
ss_kcp_opts_tmp=""
ss_sskcp_server_tmp=""
ss_sskcp_port_tmp=""
ss_ssudp_server_tmp=""
ss_ssudp_port_tmp=""
ss_ssudp_mtu_tmp=""
ss_udp_opts_tmp=""
else
ss_v2ray_tmp="0"
ss_v2ray_opts_tmp=""
ss_v2ray_plugin_tmp="0"
ss_kcp_support_tmp="0"
ss_udp_support_tmp="0"
ss_kcp_opts_tmp=""
Expand All @@ -354,7 +321,6 @@ get_ss_config(){
ss_ssudp_port_tmp=""
ss_ssudp_mtu_tmp=""
ss_udp_opts_tmp=""
ss_v2ray_plugin_tmp="0"
fi
fi

Expand All @@ -368,8 +334,8 @@ get_ss_config(){
#echo server: $server
#echo server_port: $server_port
#echo password: $password
#echo ss_obfs_tmp: $ss_obfs_tmp
#echo ss_obfs_host: $ss_obfs_host
#echo ss_v2ray_plugin_tmp: $ss_v2ray_plugin_tmp
#echo ss_v2ray_opts_tmp: $ss_v2ray_opts_tmp
#echo ------
echo "$group" >> /tmp/all_group_info.txt
[ -n "$group" ] && return 0 || return 1
Expand Down Expand Up @@ -406,15 +372,12 @@ update_ss_config(){
local_encrypt_method=$(dbus get ssconf_basic_method_$index)
[ "$local_encrypt_method" != "$encrypt_method" ] && dbus set ssconf_basic_method_$index=$encrypt_method && let i+=1

local_ss_obfs_tmp=$(dbus get ssconf_basic_ss_obfs_$index)
[ "$local_ss_obfs_tmp" != "$ss_obfs_tmp" ] && dbus set ssconf_basic_ss_obfs_$index=$ss_obfs_tmp && let i+=1

local_ss_obfs_host=$(dbus get ssconf_basic_ss_obfs_host_$index)
[ "$local_ss_obfs_host" != "$ss_obfs_host" ] && dbus set ssconf_basic_ss_obfs_host_$index=$ss_obfs_host && let i+=1

local_ss_v2ray_tmp=$(dbus get ssconf_basic_ss_v2ray_$index)
[ "$local_ss_v2ray_tmp" != "$ss_v2ray_tmp" ] && dbus set ssconf_basic_ss_v2ray_$index=$ss_v2ray_tmp && let i+=1


local_ss_v2ray_opts_tmp=$(dbus get ssconf_basic_ss_v2ray_opts_tmp_$index)
[ "$local_ss_v2ray_opts_tmp" != "$ss_v2ray_opts_tmp" ] && dbus set ssconf_basic_ss_v2ray_plugin_opts_$index=$ss_v2ray_opts_tmp && let i+=1

local_ss_kcp_support_tmp=$(dbus get ssconf_basic_ss_kcp_support_$index)
[ "$local_ss_kcp_support_tmp" != "$ss_kcp_support_tmp" ] && dbus set ssconf_basic_ss_kcp_support_$index=$ss_kcp_support_tmp && let i+=1

Expand Down Expand Up @@ -1073,8 +1036,6 @@ del_none_exist(){
dbus remove ssconf_basic_server_ip_$localindex
dbus remove ssconf_basic_ss_kcp_opts_$localindex
dbus remove ssconf_basic_ss_kcp_support_$localindex
dbus remove ssconf_basic_ss_obfs_$localindex
dbus remove ssconf_basic_ss_obfs_host_$localindex
dbus remove ssconf_basic_ss_sskcp_port_$localindex
dbus remove ssconf_basic_ss_sskcp_server_$localindex
dbus remove ssconf_basic_ss_ssudp_mtu_$localindex
Expand Down Expand Up @@ -1139,8 +1100,6 @@ remove_node_gap(){
[ -n "$(dbus get ssconf_basic_name_$nu)" ] && dbus set ssconf_basic_name_"$y"="$(dbus get ssconf_basic_name_$nu)" && dbus remove ssconf_basic_name_$nu
[ -n "$(dbus get ssconf_basic_password_$nu)" ] && dbus set ssconf_basic_password_"$y"="$(dbus get ssconf_basic_password_$nu)" && dbus remove ssconf_basic_password_$nu
[ -n "$(dbus get ssconf_basic_port_$nu)" ] && dbus set ssconf_basic_port_"$y"="$(dbus get ssconf_basic_port_$nu)" && dbus remove ssconf_basic_port_$nu
[ -n "$(dbus get ssconf_basic_ss_obfs_$nu)" ] && dbus set ssconf_basic_ss_obfs_"$y"="$(dbus get ssconf_basic_ss_obfs_$nu)" && dbus remove ssconf_basic_ss_obfs_$nu
[ -n "$(dbus get ssconf_basic_ss_obfs_host_$nu)" ] && dbus set ssconf_basic_ss_obfs_host_"$y"="$(dbus get ssconf_basic_ss_obfs_host_$nu)" && dbus remove ssconf_basic_ss_obfs_host_$nu
[ -n "$(dbus get ssconf_basic_ss_v2ray_$nu)" ] && dbus set ssconf_basic_ss_v2ray_"$y"="$(dbus get ssconf_basic_ss_v2ray_$nu)" && dbus remove ssconf_basic_ss_v2ray_$nu
[ -n "$(dbus get ssconf_basic_ss_kcp_support_$nu)" ] && dbus set ssconf_basic_ss_kcp_support_"$y"="$(dbus get ssconf_basic_ss_kcp_support_$nu)" && dbus remove ssconf_basic_ss_kcp_support_$nu
[ -n "$(dbus get ssconf_basic_ss_udp_support_$nu)" ] && dbus set ssconf_basic_ss_udp_support_"$y"="$(dbus get ssconf_basic_ss_udp_support_$nu)" && dbus remove ssconf_basic_ss_udp_support_$nu
Expand All @@ -1157,6 +1116,7 @@ remove_node_gap(){
[ -n "$(dbus get ssconf_basic_rss_protocol_param_$nu)" ] && dbus set ssconf_basic_rss_protocol_param_"$y"="$(dbus get ssconf_basic_rss_protocol_param_$nu)" && dbus remove ssconf_basic_rss_protocol_param_$nu
[ -n "$(dbus get ssconf_basic_server_$nu)" ] && dbus set ssconf_basic_server_"$y"="$(dbus get ssconf_basic_server_$nu)" && dbus remove ssconf_basic_server_$nu
[ -n "$(dbus get ssconf_basic_server_ip_$nu)" ] && dbus set ssconf_basic_server_ip_"$y"="$(dbus get ssconf_basic_server_ip_$nu)" && dbus remove ssconf_basic_server_ip_$nu
[ -n "$(dbus get ssconf_basic_ss_v2ray_plugin_$nu)" ] && dbus set ssconf_basic_ss_v2ray_plugin_"$y"="$(dbus get ssconf_basic_ss_v2ray_plugin_$nu)" && dbus remove ssconf_basic_ss_v2ray_plugin_$nu
[ -n "$(dbus get ssconf_basic_ss_v2ray_plugin_opts_$nu)" ] && dbus set ssconf_basic_ss_v2ray_plugin_opts_"$y"="$(dbus get ssconf_basic_ss_v2ray_plugin_opts_$nu)" && dbus remove ssconf_basic_ss_v2ray_plugin_opts_$nu
[ -n "$(dbus get ssconf_basic_use_kcp_$nu)" ] && dbus set ssconf_basic_use_kcp_"$y"="$(dbus get ssconf_basic_use_kcp_$nu)" && dbus remove ssconf_basic_use_kcp_$nu
[ -n "$(dbus get ssconf_basic_use_lb_$nu)" ] && dbus set ssconf_basic_use_lb_"$y"="$(dbus get ssconf_basic_use_lb_$nu)" && dbus remove ssconf_basic_use_lb_$nu
Expand Down Expand Up @@ -1473,8 +1433,6 @@ start_update(){
dbus remove ssconf_basic_server_ip_$conf_nu
dbus remove ssconf_basic_ss_kcp_opts_$conf_nu
dbus remove ssconf_basic_ss_kcp_support_$conf_nu
dbus remove ssconf_basic_ss_obfs_$conf_nu
dbus remove ssconf_basic_ss_obfs_host_$conf_nu
dbus remove ssconf_basic_ss_sskcp_port_$conf_nu
dbus remove ssconf_basic_ss_sskcp_server_$conf_nu
dbus remove ssconf_basic_ss_ssudp_mtu_$conf_nu
Expand Down Expand Up @@ -1579,9 +1537,9 @@ add() {
decode_link=""

NODE_FORMAT=$(echo $ssrlink | awk -F":" '{print $1}')
echo $NODE_FORMAT
#echo $NODE_FORMAT
link=$(echo $ssrlink | cut -f3- -d/)
echo $link
#echo $link
if [ -n "$NODE_FORMAT" ] && [ -n "$link" ]; then
echo_date 检测到${NODE_FORMAT}链接...开始尝试解析...
remarks='AddByLink'
Expand Down Expand Up @@ -1629,8 +1587,6 @@ remove_online(){
dbus remove ssconf_basic_server_ip_$remove_nu
dbus remove ssconf_basic_ss_kcp_opts_$remove_nu
dbus remove ssconf_basic_ss_kcp_support_$remove_nu
dbus remove ssconf_basic_ss_obfs_$remove_nu
dbus remove ssconf_basic_ss_obfs_host_$remove_nu
dbus remove ssconf_basic_ss_sskcp_port_$remove_nu
dbus remove ssconf_basic_ss_sskcp_server_$remove_nu
dbus remove ssconf_basic_ss_ssudp_mtu_$remove_nu
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 @@ -1214,7 +1214,7 @@ get_path(){
create_v2ray_json(){
rm -rf "$V2RAY_CONFIG_FILE_TMP"
rm -rf "$V2RAY_CONFIG_FILE"
if [ "$ss_basic_v2ray_use_json" == "0" ] || [ "$ss_basic_type" == "4" ]; then
if [ "$ss_basic_v2ray_use_json" == "0" ]; then
echo_date 生成V2Ray配置文件...
local kcp="null"
local tcp="null"
Expand Down Expand Up @@ -1383,7 +1383,7 @@ create_v2ray_json(){
EOF
fi
# outbounds area
if [ "$ss_basic_v2ray_protocol" == "vmess" ] && [ "$ss_basic_type" == "3" ]; then
if [ "$ss_basic_v2ray_protocol" == "vmess" ]; then
cat >>"$V2RAY_CONFIG_FILE_TMP" <<-EOF
"outbounds": [
{
Expand Down Expand Up @@ -1422,7 +1422,7 @@ create_v2ray_json(){
]
}
EOF
elif [ "$ss_basic_v2ray_protocol" == "vless" ] && [ "$ss_basic_type" == "3" ]; then
elif [ "$ss_basic_v2ray_protocol" == "vless" ]; then
#vless
cat >>"$V2RAY_CONFIG_FILE_TMP" <<-EOF
"outbounds": [
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.34.3
4.34.4
5 changes: 4 additions & 1 deletion shadowsocks/webs/Main_Ss_Content.asp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,8 @@ function tabclickhandler(_type) {
E('ssr_obfs_param_tr').style.display = "none";
E('gameV2_udp_tr').style.display = "none";
// 不显示 v2ray 相关条目
E('v2ray_protocol_tr').style.display = "none";
E('v2ray_xray_tr').style.display = "none";
E('v2ray_uuid_tr').style.display = "none";
E('v2ray_alterid_tr').style.display = "none";
E('v2ray_security_tr').style.display = "none";
Expand All @@ -1390,6 +1392,7 @@ function tabclickhandler(_type) {
E('v2ray_mux_enable_tr').style.display = "none";
E('v2ray_mux_concurrency_tr').style.display = "none";
E('v2ray_json_tr').style.display = "none";
E('v2ray_network_tlshost_tr').style.display = "none";
}
return save_flag;
}
Expand Down Expand Up @@ -3312,7 +3315,7 @@ function set_cron(action) {
<img id="return_btn" onclick="reload_Soft_Center();" align="right" style="cursor:pointer;position:absolute;margin-left:-30px;margin-top:-25px;" title="返回软件中心" src="/images/backprev.png" onMouseOver="this.src='/images/backprevclick.png'" onMouseOut="this.src='/images/backprev.png'"></img>
</div>
<div style="margin-left:5px;margin-top:10px;margin-bottom:10px"><img src="/images/New_ui/export/line_export.png"></div>
<div class="SimpleNote" id="head_illustrate">本插件是支持<a href="https://github.com/shadowsocks/shadowsocks-libev" target="_blank"><em><u>SS</u></em></a>、<a href="https://github.com/shadowsocksrr/shadowsocksr-libev" target="_blank"><em><u>SSR</u></em></a>、<a href="http://firmware.koolshare.cn/binary/koolgame/" target="_blank"><em><u>KoolGame</u></em></a>、<a href="https://github.com/v2ray/v2ray-core" target="_blank"><em><u>V2Ray</u></em></a>、<a target="_blank" href="https://github.com/trojan-gfw/trojan"><em><u>Trojan</u></em></a>四种客户端的科学上网、游戏加速工具。</div>
<div class="SimpleNote" id="head_illustrate">本插件是支持<a href="https://github.com/shadowsocks/shadowsocks-libev" target="_blank"><em><u>SS</u></em></a>、<a href="https://github.com/shadowsocksrr/shadowsocksr-libev" target="_blank"><em><u>SSR</u></em></a>、<a href="http://firmware.koolshare.cn/binary/koolgame/" target="_blank"><em><u>KoolGame</u></em></a>、<a href="https://github.com/v2ray/v2ray-core" target="_blank"><em><u>V2Ray</u></em></a>、<a target="_blank" href="https://github.com/XTLS/Xray-core"><em><u>Xray（支持Vless、Trojan）</u></em></a>六种客户端的科学上网、游戏加速工具。</div>
<div style="margin-top: 0px;text-align: center;font-size: 18px;margin-bottom: 0px;" class="formfontdesc" id="cmdDesc"></div>
<!-- this is the popup area for status -->
<div id="detail_status" class="content_status" style="box-shadow: 3px 3px 10px #000;margin-top: 0px;display: none;">
Expand Down

0 comments on commit 4087347

Please sign in to comment.