diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass index 064d4fd1f..c07e3cfc8 100755 --- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass +++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass @@ -289,7 +289,7 @@ _bypass_proto() { _intf_rule_ss_rules() { rule_name=$1 - [ "$rule_name" = "ss_rules" ] && rule_name="default" + [ "$rule_name" = "ss_rules" ] && rule_name="def" if [ "$(iptables --wait=40 -t nat -L -n | grep ss_rules_${rule_name}_pre_src)" != "" ] && [ "$(iptables --wait=40 -t nat -L -n | grep omr_dst_bypass_$intf)" = "" ]; then iptables-restore -w --wait=60 --noflush <<-EOF *nat @@ -411,7 +411,7 @@ _bypass_omr_server() { _ss_rules_config() { rule_name=$1 - [ "$rule_name" = "ss_rules" ] && rule_name="default" + [ "$rule_name" = "ss_rules" ] && rule_name="def" if [ "$(iptables --wait=40 -t nat -L -n | grep ss_rules_${rule_name}_pre_src)" != "" ] && [ "$(iptables --wait=40 -t nat -L -n | grep omr_dst_bypass_all)" = "" ]; then iptables-restore -w --wait=60 --noflush <<-EOF *nat @@ -431,7 +431,7 @@ _ss_rules_config() { COMMIT EOF fi - if [ "$(ip6tables --wait=40 -t nat -L | grep ss_rules6_default_pre_src)" != "" ] && [ "$(ip6tables --wait=40 -t nat -L | grep omr6_dst_bypass_all)" = "" ]; then + if [ "$(ip6tables --wait=40 -t nat -L | grep ss_rules6_${rule_name}_pre_src)" != "" ] && [ "$(ip6tables --wait=40 -t nat -L | grep omr6_dst_bypass_all)" = "" ]; then ip6tables-restore -w --wait=60 --noflush <<-EOF *nat -I ss_rules6_${rule_name}_dst 1 -m set --match-set omr6_dst_bypass_all dst -j RETURN @@ -473,6 +473,7 @@ start_service() { *mangle :omr-bypass - -I PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass + -I OUTPUT -m addrtype ! --dst-type LOCAL -j omr-bypass COMMIT EOF if [ "$disableipv6" != "1" ]; then @@ -481,6 +482,7 @@ start_service() { *mangle :omr-bypass6 - -I PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass6 + -I OUTPUT -m addrtype ! --dst-type LOCAL -j omr-bypass6 COMMIT EOF fi @@ -537,6 +539,7 @@ start_service() { *mangle :omr-bypass-dpi - -A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi + -A OUTPUT -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi -A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass-dpi COMMIT EOF @@ -546,6 +549,7 @@ start_service() { *mangle :omr-bypass6-dpi - -A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi + -A OUTPUT -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi -A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass6-dpi COMMIT EOF