From 8c951c94e6c3bd9cd1e8ac8be0db18729d5e83c1 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 13 Apr 2021 14:01:12 +0800 Subject: [PATCH] luci-app-ssr-plus: re-append protocol arg for ss-rust Fixes: b8444816273b4 ("luci-app-ssr-plus: move shadowsocks UDP argument to configuration") Signed-off-by: Tianling Shen --- .../lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index c2851c4787..1216ec283a 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -339,7 +339,8 @@ start_udp() { ss | ssr) gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port ss_program="$(first_type ${type}local ${type}-redir)" - ln_start_bin $ss_program ${type}-redir -c $udp_config_file + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" + ln_start_bin $ss_program ${type}-redir -c $udp_config_file $ss_extra_arg echolog "UDP TPROXY Relay:$(get_name $type) Started!" ;; v2ray) @@ -381,7 +382,8 @@ start_shunt() { ss | ssr) gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port ss_program="$(first_type ${type}local ${type}-redir)" - ln_start_bin $ss_program ${type}-redir -c $shunt_config_file + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" + ln_start_bin $ss_program ${type}-redir -c $shunt_config_file $ss_extra_arg if [ -n "$tmp_local_port" ]; then local tmp_port=$tmp_local_port else @@ -528,8 +530,9 @@ Start_Run() { ss | ssr) gen_config_file $GLOBAL_SERVER $type 1 $tcp_port ss_program="$(first_type ${type}local ${type}-redir)" + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" for i in $(seq 1 $threads); do - ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file + ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file $ss_extra_arg done echolog "Main node:$(get_name $type) $threads Threads Started!" ;;