When using DHCPv6 and only requesting a prefix the communication on the WAN interface will be over link-local so return the link-local address of the interface in this case rather than nothing.

1 files changed, 12 insertions, 0 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 417e988..0f9f289 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -4505,6 +4505,18 @@ function get_interface_ipv6($interface = "wan", $flush = false) {
 			return null;
 	}
 
+	/*
+	 * NOTE: On the case when only the prefix is requested,
+	 * the communication on WAN will be done over link-local.
+	 */
+	if (is_array($config['interfaces'][$interface])) {
+		if (isset($config['interfaces'][$interface]['dhcp6prefixonly'])) {
+			$curip = find_interface_ipv6_ll($realif, $flush);
+			if ($curip && is_ipaddrv6($curip) && ($curip != "::"))
+				return $curip;
+		}
+	}
+
 	$curip = find_interface_ipv6($realif, $flush);
 	if ($curip && is_ipaddrv6($curip) && ($curip != "::"))
 		return $curip;