From c7036be53c3756bd26d7033adbd7d883e4246e75 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 13 Dec 2024 15:17:54 +0100
Subject: [PATCH] dhcp: allow radvd to use /128 CARP VIP as source

The check is for the subnet use, not the CARP source check in
between.

PR: https://forum.opnsense.org/index.php?topic=44634.0
---
 src/etc/inc/plugins.inc.d/dhcpd.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc
index b301ed82d..ed3d71588 100644
--- a/src/etc/inc/plugins.inc.d/dhcpd.inc
+++ b/src/etc/inc/plugins.inc.d/dhcpd.inc
@@ -251,7 +251,7 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
         }
 
         foreach (config_read_array('virtualip', 'vip') as $vip) {
-            if ($vip['interface'] != $dhcpv6if || !is_ipaddrv6($vip['subnet']) || $vip['subnet_bits'] == '128') {
+            if ($vip['interface'] != $dhcpv6if || !is_ipaddrv6($vip['subnet'])) {
                 continue;
             }
 
@@ -263,7 +263,7 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
                 continue;
             }
 
-            if (!empty($vip['nobind'])) {
+            if ($vip['subnet_bits'] == '128' || !empty($vip['nobind'])) {
                 continue;
             }