From 4820cfe7e244cee1820200d39c645ce6853b203b Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Tue, 23 Oct 2018 15:07:23 +0200
Subject: [PATCH] Fix omr-bypass

---
 luci-app-omr-bypass/root/etc/init.d/omr-bypass          | 7 +++++--
 luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

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 fda8b1993..f57a17682 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -179,23 +179,26 @@ start_service() {
 		COMMIT
 		EOF
 	fi
-	
+
 	iptables-save --counters | grep -v omr-bypass-dpi | iptables-restore --counters
-	ip6tables-save --counters | grep -v omr-bypass-dpi | ip6tables-restore --counters
 	iptables-restore --wait=60  --noflush <<-EOF
 	*mangle
 	:omr-bypass-dpi -
 	-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
+	-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass-dpi
 	COMMIT
 	EOF
+	ip6tables-save --counters | grep -v omr-bypass-dpi | ip6tables-restore --counters
 	ip6tables-restore --wait=60  --noflush <<-EOF
 	*mangle
 	:omr-bypass-dpi -
 	-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
+	-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass-dpi
 	COMMIT
 	EOF
 	config_load omr-bypass
 	config_foreach _bypass_proto dpis
+
 	logger -t "omr-bypass" "OMR-ByPass is running"
 }
 
diff --git a/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass b/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
index 7988fd79c..ba069c0dd 100644
--- a/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
+++ b/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
@@ -49,9 +49,9 @@ if [ -n "$(uci -q get dhcp.dnsmasq[0].ipset)" ]; then
 	}
 fi
 
-if [ "$(uci -q get ucitrack.@shadowsocks-libev[-1].affects | grep omr-bypass)" = "" ]; then
+if [ "$(uci -q get ucitrack.@shadowsocks-libev[-1].affects | grep omr-bypass)" != "" ]; then
 	uci -q batch <<-EOF >/dev/null
-		add_list ucitrack.@shadowsocks-libev[-1].affects=omr-bypass
+		del_list ucitrack.@shadowsocks-libev[-1].affects=omr-bypass
 	EOF
 fi
 s=firewall.omr-bypass