Просмотр исходного кода

luci-app-ssr-plus: re-append protocol arg for ss-rust

Fixes: dc13501b721d78 ("luci-app-ssr-plus: move shadowsocks UDP argument to configuration")

Signed-off-by: Tianling Shen <[email protected]>
Tianling Shen 4 лет назад
Родитель
Сommit
520e9f075c
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      luci-app-ssr-plus/root/etc/init.d/shadowsocksr

+ 6 - 3
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!"
 		;;