From 37ac209817665e105ddfb20e58b3981a201bfde2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 20 Mar 2024 14:02:44 +0100 Subject: [PATCH] Fix omr-bypass interfaces fw rules related to proxy --- omr-bypass/files/etc/init.d/omr-bypass-nft | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omr-bypass/files/etc/init.d/omr-bypass-nft b/omr-bypass/files/etc/init.d/omr-bypass-nft index eb8781451..cc8a32a2d 100755 --- a/omr-bypass/files/etc/init.d/omr-bypass-nft +++ b/omr-bypass/files/etc/init.d/omr-bypass-nft @@ -713,15 +713,15 @@ _intf_rule() { add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_6" EOF - if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ]; then + if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then config_load shadowsocks-libev config_foreach _intf_rule_ss_rules ss_rules - elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ]; then + elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ]; then config_load shadowsocks-rust config_foreach _intf_rule_ss_rules ss_rules - elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "v2ray" ]; then + elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "v2ray" ] && [ "$(uci -q get v2ray.main.enabled)" = "1" ]; then _intf_rule_v2ray_rules - elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "xray" ]; then + elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "xray" ] && [ "$(uci -q get xray.main.enabled)" = "1" ]; then _intf_rule_xray_rules fi