From ad2021a174cbeab3c49ba286e002dc7c19045dc6 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 12 Apr 2021 23:46:09 +0800 Subject: [PATCH 1/2] v2ray-core: update to 4.37.3 Signed-off-by: Tianling Shen --- package/lean/v2ray/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index 4a80d149ad..879148a4b0 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.37.2 +PKG_VERSION:=4.37.3 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=ece74b2f0e04d9cd487d1b4d79010f0269b6ee0742aaeb147979e5b97639ffa3 +PKG_HASH:=b5001622b8a67c4a8e57651ef0f9d23f20604b7a65a18db47e51c1e19c3be08a PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From c4436cbb5698c0c07061d578114e1a16697bb902 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 13 Apr 2021 14:01:12 +0800 Subject: [PATCH 2/2] luci-app-ssr-plus: re-append protocol arg for ss-rust Fixes: 4fdf4ff65a667 ("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!" ;;