From 88e16d51f1a950a1e5fab8a92ef47a221333aea6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 28 May 2023 07:51:38 +0200
Subject: [PATCH] Do no create ipset if there is no empty for a protocol

---
 .../root/etc/init.d/omr-bypass                | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 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 92b0a6240..95c298bb4 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -495,47 +495,49 @@ _bypass_proto_without_ndpi() {
 	[ -z "$intf" ] && intf="all"
 	[ -z "$proto" ] && return
 	if [ "$(uci -q get openmptcprouter.settings.ndpi)" == "0" ] || [ "$ndpi" == "0" ]; then
-		ipset -q flush bypass_$proto > /dev/null 2>&1
-		ipset -q --exist restore <<-EOF
-		create bypass_$proto hash:net hashsize 64
-		EOF
-		ALLIPS=$(sqlite3 /usr/share/omr-bypass/omr-bypass.db "select ip from ipproto where proto='"$proto"';" ".exit")
-		for ip in $ALLIPS; do
-			ipset -q add bypass_$proto $ip
-		done
-		if [ "$intf" = "all" ]; then
-			if [ "$family" = "ipv4" ] || [ "$family" = "ipv4ipv6" ]; then
-				$IPTABLESRESTORE -w --wait=60  --noflush <<-EOF
-				*mangle
-				-A omr-bypass-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x539
-				-A omr-bypass-dpi -m mark --mark 0x539 -j RETURN
-				COMMIT
-				EOF
-			fi
-			if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then
-				$IP6TABLESRESTORE -w --wait=60  --noflush <<-EOF
-				*mangle
-				-A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539
-				-A omr-bypass6-dpi -m mark --mark 0x6539 -j RETURN
-				COMMIT
-				EOF
-			fi
-		else
-			if [ "$family" = "ipv4" ] || [ "$family" = "ipv4ipv6" ]; then
-				$IPTABLESRESTORE -w --wait=60  --noflush <<-EOF
-				*mangle
-				-A omr-bypass-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x539$intfid
-				-A omr-bypass-dpi -m mark --mark 0x539$intfid -j RETURN
-				COMMIT
-				EOF
-			fi
-			if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then
-				$IP6TABLESRESTORE -w --wait=60  --noflush <<-EOF
-				*mangle
-				-A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539$intfid
-				-A omr-bypass6-dpi -m mark --mark 0x6539$intfid -j RETURN
-				COMMIT
-				EOF
+		ALLIPS=$(sqlite3 /usr/share/omr-bypass/omr-bypass.db "select ip from ipproto where proto=\"$proto\";" ".exit")
+		if [ -n "$ALLIPS" ]; then
+			ipset -q flush bypass_$proto > /dev/null 2>&1
+			ipset -q --exist restore <<-EOF
+			create bypass_$proto hash:net hashsize 64
+			EOF
+			for ip in $ALLIPS; do
+				ipset -q add bypass_$proto $ip
+			done
+			if [ "$intf" = "all" ]; then
+				if [ "$family" = "ipv4" ] || [ "$family" = "ipv4ipv6" ]; then
+					$IPTABLESRESTORE -w --wait=60  --noflush <<-EOF
+					*mangle
+					-A omr-bypass-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x539
+					-A omr-bypass-dpi -m mark --mark 0x539 -j RETURN
+					COMMIT
+					EOF
+				fi
+				if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then
+					$IP6TABLESRESTORE -w --wait=60  --noflush <<-EOF
+					*mangle
+					-A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539
+					-A omr-bypass6-dpi -m mark --mark 0x6539 -j RETURN
+					COMMIT
+					EOF
+				fi
+			else
+				if [ "$family" = "ipv4" ] || [ "$family" = "ipv4ipv6" ]; then
+					$IPTABLESRESTORE -w --wait=60  --noflush <<-EOF
+					*mangle
+					-A omr-bypass-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x539$intfid
+					-A omr-bypass-dpi -m mark --mark 0x539$intfid -j RETURN
+					COMMIT
+					EOF
+				fi
+				if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then
+					$IP6TABLESRESTORE -w --wait=60  --noflush <<-EOF
+					*mangle
+					-A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539$intfid
+					-A omr-bypass6-dpi -m mark --mark 0x6539$intfid -j RETURN
+					COMMIT
+					EOF
+				fi
 			fi
 		fi
 	fi