From 51af004088b225183c3b8d3070ae9f81f0f2b7fd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 14 Jul 2019 21:12:10 +0200
Subject: [PATCH] Only reload rules when needed for omr-bypass

---
 luci-app-omr-bypass/root/etc/firewall.omr-bypass | 2 +-
 luci-app-omr-bypass/root/etc/init.d/omr-bypass   | 5 +++++
 shadowsocks-libev/files/shadowsocks-libev.init   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/luci-app-omr-bypass/root/etc/firewall.omr-bypass b/luci-app-omr-bypass/root/etc/firewall.omr-bypass
index 7b231ae6a..fe65adb2f 100644
--- a/luci-app-omr-bypass/root/etc/firewall.omr-bypass
+++ b/luci-app-omr-bypass/root/etc/firewall.omr-bypass
@@ -1,2 +1,2 @@
 #!/bin/sh
-/etc/init.d/omr-bypass reload
+/etc/init.d/omr-bypass reload_rules
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 991cc91ac..ff6109c6b 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -4,6 +4,7 @@
 START=99
 STOP=10
 USE_PROCD=1
+EXTRA_COMMANDS="reload_rules"
 
 . /usr/lib/unbound/iptools.sh
 
@@ -427,6 +428,10 @@ service_triggers() {
 }
 
 reload_service() {
+	start
+}
+
+reload_rules() {
 	[ "$( ipset -n list | grep omr_ )" = "" ] && return 0
 	RELOAD=1
 	start
diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init
index a425beb0e..9bb78ac4a 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/shadowsocks-libev/files/shadowsocks-libev.init
@@ -261,7 +261,7 @@ rules_up() {
 	ss_rules
 	[ -f /etc/init.d/omr-bypass ] && {
 		logger -t "Shadowsocks" "Reload omr-bypass rules"
-		/etc/init.d/omr-bypass reload
+		/etc/init.d/omr-bypass reload_rules
 	}
 }