From 4894da909eaaa145c6160b0395f10956d4591ad9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:15:36 +0200
Subject: [PATCH] Set ULA to VPS API

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index a29e9a3be..01c37518e 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -521,8 +521,9 @@ _set_vpn_ip() {
 	vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
 	[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
 	[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
+	ula="$(uci -q get network.globals.ula_prefix)"
 	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ]); then
-		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'"}'
+		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : "'$ula'"}'
 		result=$(_set_json "vpnips" "$settings")
 	fi
 }
@@ -717,6 +718,13 @@ _set_config_from_vps() {
 		/etc/init.d/omr-tracker restart
 	fi
 
+	ula="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.ula')"
+	if [ -n "$ula" ]; then
+			uci -q batch <<-EOF >/dev/null
+			set network.globals.ula_prefix=$ula
+			EOF
+	fi
+
 	# Set current VPN
 	current_vpn="$(uci -q get openmptcprouter.settings.vpn)"
 	if [ -z "$current_vpn" ] || [ -n "$vps_lastchange" ] || [ "$user_permission" = "ro" ]; then