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 omr-bypass when proxy rules doesn't exist

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-01-13 00:01:43 +01:00
parent 37498c1725
commit 1a9c152ef9
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
omr-bypass/files/etc/init.d/omr-bypass-nft
View file

@ -724,6 +724,7 @@ _bypass_omr_server() {
_ss_rules_config() { _ss_rules_config() {
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
[ -z "\$(nft list ruleset | grep ss_rules)" ] && exit 0
nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_all_4 accept nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
EOF EOF
@ -737,6 +738,7 @@ _ss_rules_config() {
_v2ray_rules_config() { _v2ray_rules_config() {
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
[ -z "\$(nft list ruleset | grep v2r_rules)" ] && exit 0
nft insert rule inet fw4 v2r_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept nft insert rule inet fw4 v2r_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_all_4 accept nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
EOF EOF
@ -750,6 +752,7 @@ _v2ray_rules_config() {
_xray_rules_config() { _xray_rules_config() {
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
[ -z "\$(nft list ruleset | grep xr_rules)" ] && exit 0
nft insert rule inet fw4 xr_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept nft insert rule inet fw4 xr_rules_dst_tcp ip daddr @omr_dst_bypass_all_4 accept
nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_all_4 accept nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_all_4 accept
EOF EOF
@ -798,7 +801,7 @@ start_service() {
} }
disableipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)" disableipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
#noipv6="$(uci -q get omr-bypass.global.noipv6)" #noipv6="$(uci -q get omr-bypass.global.noipv6)"
rm -f /etc/firewall.omr-bypass
cat > /etc/firewall.omr-bypass <<-EOF cat > /etc/firewall.omr-bypass <<-EOF
#!/bin/sh #!/bin/sh
#nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_all accept #nft insert rule inet fw4 ss_rules_dst_tcp ip daddr @omr_dst_bypass_all accept
@ -916,11 +919,13 @@ service_triggers() {
reload_service() { reload_service() {
RELOAD=1 RELOAD=1
stop
start start
} }
reload_rules() { reload_rules() {
#[ "$( ipset -n list | grep omr_ )" = "" ] && return 0 #[ "$( ipset -n list | grep omr_ )" = "" ] && return 0
RELOAD=1 RELOAD=1
stop
start start
} }