fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-ssr-plus: move shadowsocks UDP argument to configuration

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-04-12 20:04:42 +08:00
parent b4a9027084
commit b844481627
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=183 PKG_VERSION:=183
PKG_RELEASE:=9 PKG_RELEASE:=10
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \

22
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -26,7 +26,6 @@ server_config_file=
shunt_dns_config_file= shunt_dns_config_file=
tmp_local_port= tmp_local_port=
ARG_UDP= ARG_UDP=
ARG_OTA=
dns_port="5335" #dns port dns_port="5335" #dns port
tmp_dns_port="300" #dns2socks temporary port tmp_dns_port="300" #dns2socks temporary port
tmp_udp_port="301" #udp temporary port tmp_udp_port="301" #udp temporary port
@ -340,9 +339,7 @@ start_udp() {
ss | ssr) ss | ssr)
gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port
ss_program="$(first_type ${type}local ${type}-redir)" ss_program="$(first_type ${type}local ${type}-redir)"
[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && ln_start_bin $ss_program ${type}-redir -c $udp_config_file
local ss_extra_arg="--protocol redir -u" || local ss_extra_arg="-U"
ln_start_bin $ss_program ${type}-redir -c $udp_config_file $ss_extra_arg
echolog "UDP TPROXY Relay:$(get_name $type) Started!" echolog "UDP TPROXY Relay:$(get_name $type) Started!"
;; ;;
v2ray) v2ray)
@ -384,8 +381,7 @@ start_shunt() {
ss | ssr) ss | ssr)
gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port
ss_program="$(first_type ${type}local ${type}-redir)" ss_program="$(first_type ${type}local ${type}-redir)"
[ "$(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
ln_start_bin $ss_program ${type}-redir -c $shunt_config_file $ss_extra_arg
if [ -n "$tmp_local_port" ]; then if [ -n "$tmp_local_port" ]; then
local tmp_port=$tmp_local_port local tmp_port=$tmp_local_port
else else
@ -471,9 +467,7 @@ start_local() {
ss | ssr) ss | ssr)
gen_config_file $LOCAL_SERVER $type 4 $local_port gen_config_file $LOCAL_SERVER $type 4 $local_port
ss_program="$(first_type ${type}local ${type}-local)" ss_program="$(first_type ${type}local ${type}-local)"
[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && ln_start_bin $ss_program ${type}-local -c $local_config_file
local ss_extra_arg="-U" || local ss_extra_arg="-u"
ln_start_bin $ss_program ${type}-local -c $local_config_file $ss_extra_arg
echolog "Global_Socks5:$(get_name $type) Started!" echolog "Global_Socks5:$(get_name $type) Started!"
;; ;;
v2ray) v2ray)
@ -534,13 +528,8 @@ Start_Run() {
ss | ssr) ss | ssr)
gen_config_file $GLOBAL_SERVER $type 1 $tcp_port gen_config_file $GLOBAL_SERVER $type 1 $tcp_port
ss_program="$(first_type ${type}local ${type}-redir)" ss_program="$(first_type ${type}local ${type}-redir)"
[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] &&
{
local ss_extra_arg="--protocol redir"
case ${ARG_OTA} in '-u') ARG_OTA='-U' ;; esac
}
for i in $(seq 1 $threads); do for i in $(seq 1 $threads); do
ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file $ARG_OTA $ss_extra_arg ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file
done done
echolog "Main node:$(get_name $type) $threads Threads Started!" echolog "Main node:$(get_name $type) $threads Threads Started!"
;; ;;
@ -605,16 +594,13 @@ load_config() {
mode="tcp,udp" mode="tcp,udp"
tcp_config_file=$TMP_PATH/tcp-udp-ssr-retcp.json tcp_config_file=$TMP_PATH/tcp-udp-ssr-retcp.json
ARG_UDP="-u" ARG_UDP="-u"
ARG_OTA="-u"
UDP_RELAY_SERVER=$GLOBAL_SERVER UDP_RELAY_SERVER=$GLOBAL_SERVER
;; ;;
*) *)
mode="udp" mode="udp"
udp_config_file=$TMP_PATH/udp-only-ssr-reudp.json udp_config_file=$TMP_PATH/udp-only-ssr-reudp.json
ARG_UDP="-U" ARG_UDP="-U"
ARG_OTA="-U"
start_udp start_udp
ARG_OTA=""
mode="tcp" mode="tcp"
;; ;;
esac esac

1
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
View File

@ -223,6 +223,7 @@ local ss = {
server_port = tonumber(server.server_port), server_port = tonumber(server.server_port),
local_address = "0.0.0.0", local_address = "0.0.0.0",
local_port = tonumber(local_port), local_port = tonumber(local_port),
mode = (proto == "tcp,udp") and "tcp_and_udp" or proto .. "_only",
password = server.password, password = server.password,
method = server.encrypt_method_ss, method = server.encrypt_method_ss,
timeout = tonumber(server.timeout), timeout = tonumber(server.timeout),