From 56e83988e59761175a5251b5586282f9c2e90464 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 26 Jun 2024 14:48:38 +0200
Subject: [PATCH] Fixes on omr-6in4

---
 omr-6in4/files/bin/omr-6in4        |  3 ++-
 omr-6in4/files/etc/init.d/omr-6in4 | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4
index 4af348f2f..224f04dce 100755
--- a/omr-6in4/files/bin/omr-6in4
+++ b/omr-6in4/files/bin/omr-6in4
@@ -26,7 +26,8 @@ while true; do
 		[ -z "$peer" ] && peer=$(ip -4 r list dev $iface | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
 		[ -z "$peer" ] && peer=$(ip -4 r list dev $iface | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d "\n")
 		[ -n "$addr" ] && [ -n "$peer" ] && {
-			if ([ "$addr" != "$(uci -q get network.omr6in4.ipaddr)" ] || [ "$peer" != "$(uci -q get network.omr6in4.peeraddr)" ]) && [ "$(ip -6 route show default dev 6in4-omr6in4 metric 1 | grep via)" = "" ]; then
+			logger -t "omr6in4" "addr: $addr - peer: $peer"
+			if [ "$addr" != "$(uci -q get network.omr6in4.ipaddr)" ] || [ "$peer" != "$(uci -q get network.omr6in4.peeraddr)" ] || [ "$(ip -6 route show default dev 6in4-omr6in4 metric 1 | grep via)" = "" ]; then
 				logger -t "omr6in4" "Set network for OMR 6in4 to local $addr peer $peer"
 				uci -q batch <<-EOF
 					set network.omr6in4.ipaddr=$addr
diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4
index b46760cb1..a16595f9a 100755
--- a/omr-6in4/files/etc/init.d/omr-6in4
+++ b/omr-6in4/files/etc/init.d/omr-6in4
@@ -37,12 +37,14 @@ set_ipv6_state() {
 		logger -t "omr-6in4" "Disable IPv6"
 		if [ "$disable_6in4" != "1" ]; then
 			uci -q batch <<-EOF >/dev/null
-				set unbound.@unbound[-1].protocol='ip4_only'
-				commit unbound
 				del_list v2ray.main.inbounds="omr6"
 				commit v2ray
 			EOF
 		fi
+		uci -q batch <<-EOF >/dev/null
+    			set unbound.@unbound[-1].protocol='ip4_only'
+			commit unbound
+		EOF
 		config_load shadowsocks-libev
 		config_foreach set_shadowsocks_address ss_redir "0.0.0.0"
 		config_load shadowsocks-rust
@@ -60,8 +62,6 @@ set_ipv6_state() {
 				set network.omr6in4.force_link=1
 				set network.omr6in4.metric=1
 				delete network.omr6in4.auto
-				set unbound.@unbound[-1].protocol='mixed'
-				commit unbound
 			EOF
 			if [ "$(uci -q get network.globals.ula_prefix)" = "" ]; then
 				r1=$(dd if=/dev/urandom bs=1 count=1 |hexdump -e '1/1 "%02x"')
@@ -70,6 +70,10 @@ set_ipv6_state() {
 				uci -q set network.globals.ula_prefix=fd$r1:$r2:$r3::/48
 			fi
 		fi
+		uci -q batch <<-EOF >/dev/null
+			set unbound.@unbound[-1].protocol='mixed'
+			commit unbound
+		EOF
 		config_load shadowsocks-libev
 		config_foreach set_shadowsocks_address ss_redir "::"
 		config_load shadowsocks-rust