From 6fa355afdb70fcced45dfd63128192c8cdeddf91 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 19 Feb 2024 20:09:43 +0100 Subject: [PATCH] Fix a bug when shadowsocks-libev or shadowsocks-rust are launched with ss-rules enabled but no server enabled --- shadowsocks-libev/files/shadowsocks-libev.init-nft | 3 +++ shadowsocks-rust/files/shadowsocks-rust.init-nft | 3 +++ 2 files changed, 6 insertions(+) diff --git a/shadowsocks-libev/files/shadowsocks-libev.init-nft b/shadowsocks-libev/files/shadowsocks-libev.init-nft index c69eade3c..e0d6ba774 100755 --- a/shadowsocks-libev/files/shadowsocks-libev.init-nft +++ b/shadowsocks-libev/files/shadowsocks-libev.init-nft @@ -180,6 +180,9 @@ ss_rules_nft_gen() { validate_ss_rules_section "$cfg" || return 1 [ "$disabled" = 0 ] || return 2 + config_get server "$cfg" server + [ "$(uci -q get shadowsocks-libev.${server}.disabled)" = "1" ] && return 2 + if [ "$ss_rules_redir_tcp_$redir_tcp" = "all" ]; then min_ss_redir_ports="65535" max_ss_redir_ports="0" diff --git a/shadowsocks-rust/files/shadowsocks-rust.init-nft b/shadowsocks-rust/files/shadowsocks-rust.init-nft index 158df38f7..9e708648f 100755 --- a/shadowsocks-rust/files/shadowsocks-rust.init-nft +++ b/shadowsocks-rust/files/shadowsocks-rust.init-nft @@ -150,6 +150,9 @@ ss_rules_nft_gen() { validate_ss_rules_section "$cfg" || return 1 [ "$disabled" = 0 ] || return 2 + config_get server "$cfg" server + [ "$(uci -q get shadowsocks-rust.${server}.disabled)" = "1" ] && return 2 + if [ "$ss_rules_redir_tcp_$redir_tcp" = "all" ]; then min_ss_redir_ports="65535" max_ss_redir_ports="0"