mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix Shadowsocks* that is using wrong redir sometimes

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-07-09 13:11:30 +02:00
parent adb26ec322
commit 6433f60533
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shadowsocks-libev/files/shadowsocks-libev.init-nft
View file

@ -163,7 +163,8 @@ ss_redir_ports() {
port=$(uci -q get shadowsocks-libev.$1.local_port)
server=$(uci -q get shadowsocks-libev.$1.server)
disabled=$(uci -q get shadowsocks-libev.$1.disabled)
if [ "$disabled" != "1" ] && ([ "$server" = "$2" ] || [ "$2" = "" ]); then
server_disabled=$(uci -q get shadowsocks-libev.${server}.disabled)
if [ "$disabled" != "1" ] && [ "$server_disabled" != "1" ]; then
if [ "$port" -lt "$min_ss_redir_ports" ]; then
min_ss_redir_ports=$port
fi
@ -195,7 +196,7 @@ ss_rules_nft_gen() {
min_ss_redir_ports="65535"
max_ss_redir_ports="0"
config_load shadowsocks-libev
config_foreach ss_redir_ports ss_redir $cfgrulesserver
config_foreach ss_redir_ports ss_redir
if [ "$min_ss_redir_ports" != "$max_ss_redir_ports" ]; then
all_ss_redir_ports=$min_ss_redir_ports-$max_ss_redir_ports
else

5
shadowsocks-rust/files/shadowsocks-rust.init-nft
View file

@ -136,7 +136,8 @@ ss_redir_ports() {
port=$(uci -q get shadowsocks-rust.$1.local_port)
server=$(uci -q get shadowsocks-rust.$1.server)
disabled=$(uci -q get shadowsocks-rust.$1.disabled)
if [ "$disabled" != "1" ] && ([ "$server" = "$2" ] || [ "$2" = "" ]); then
server_disabled=$(uci -q get shadowsocks-rust.${server}.disabled)
if [ "$disabled" != "1" ] && [ "$server_disabled" != "1" ]; then
if [ "$port" -lt "$min_ss_redir_ports" ]; then
min_ss_redir_ports=$port
fi
@ -165,7 +166,7 @@ ss_rules_nft_gen() {
min_ss_redir_ports="65535"
max_ss_redir_ports="0"
config_load shadowsocks-rust
config_foreach ss_redir_ports ss_redir $cfgrulesserver
config_foreach ss_redir_ports ss_redir
[ "$max_ss_redir_ports" = "0" ] && return 2
if [ "$min_ss_redir_ports" != "$max_ss_redir_ports" ]; then
all_ss_redir_ports=$min_ss_redir_ports-$max_ss_redir_ports