From ff7e84bf78b040fe26de77505d1c032e5646c852 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:16:12 +0200
Subject: [PATCH] Fixes for IPv6 support

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

diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4
index 34c03a17c..34a02a3e5 100755
--- a/omr-6in4/files/bin/omr-6in4
+++ b/omr-6in4/files/bin/omr-6in4
@@ -42,6 +42,7 @@ while true; do
 				[ "$ipv6_gw" = "::" ] && ipv6_gw='fd80::a00:1'
 				[ -z "$ipv6_gw" ] && ipv6_gw='fd80::a00:1'
 				#[ -z "$ipv6_gw" ] && ipv6_gw='fe80::aff:ff01'
+				ip -6 route add ${ipv6_gw} dev 6in4-omr6in4
 				ip -6 route replace default via ${ipv6_gw} dev 6in4-omr6in4 > /dev/null 2>&1
 				if [ "$(uci -q get openmptcprouter.settings.uci_route)" = "1" ]; then
 					uci -q batch <<-EOF
diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4
index 91d593f06..f467994c0 100755
--- a/omr-6in4/files/etc/init.d/omr-6in4
+++ b/omr-6in4/files/etc/init.d/omr-6in4
@@ -10,6 +10,10 @@
 	USE_PROCD=1
 }
 
+set_shadowsocks_address() {
+	config_set "$1" local_address "$2"
+}
+
 set_ipv6_state() {
 	local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
 	[ -z "$disable_ipv6" ] && disable_ipv6="1"
@@ -32,8 +36,9 @@ set_ipv6_state() {
 			delete dhcp.lan.ra_default
 			delete dhcp.lan.ra_management
 			delete dhcp.lan.ra_preference
-			set shadowsocks-libev.hi.local_address="0.0.0.0"
 		EOF
+		config_load shadowsocks-libev
+		config_foreach set_shadowsocks_address ss_redir "0.0.0.0"
 	else
 		logger -t "omr-6in4" "Enable IPv6"
 		uci -q batch <<-EOF >/dev/null
@@ -44,8 +49,9 @@ set_ipv6_state() {
 			set dhcp.lan.ra_management="1"
 			set network.lan.ipv6="1"
 			set network.lan.delegate="0"
-			set shadowsocks-libev.hi.local_address="::"
 		EOF
+		config_load shadowsocks-libev
+		config_foreach set_shadowsocks_address ss_redir "::"
 	fi
 	uci -q batch <<-EOF >/dev/null
 		commit network