From 97da2221d7e9ba7714258afecb17cdfc0d787bda Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 2 Apr 2025 16:24:25 +0200
Subject: [PATCH] radvd: refactor use of get_configured_carp_interface_list()

---
 src/www/services_router_advertisements.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php
index 5ce7f0ab0..4ab69c0c5 100644
--- a/src/www/services_router_advertisements.php
+++ b/src/www/services_router_advertisements.php
@@ -343,13 +343,13 @@ include("head.inc");
 <?php
                     $carplist = [];
                     $aliaslist = [];
-                    foreach (get_configured_carp_interface_list() as $ifname => $vip) {
-                      if ((preg_match("/^{$if}_/", $ifname)) && (is_linklocal($vip))) {
-                        $carplist[$ifname] = convert_friendly_interface_to_friendly_descr($ifname);
-                      }
-                    }
                     foreach (config_read_array('virtualip', 'vip') as $vip) {
-                      if ($vip['mode'] == 'ipalias' && $if == $vip['interface'] && is_linklocal($vip['subnet'])) {
+                      if ($if != $vip['interface'] || !is_linklocal($vip['subnet'])) {
+                          continue;
+                      } elseif ($vip['mode'] == 'carp') {
+                        $ifname = "{$vip['interface']}_vip{$vip['vhid']}"; /* XXX this code shouldn't know how to construct this */
+                        $carplist[$ifname] = convert_friendly_interface_to_friendly_descr($ifname);
+                      } elseif ($vip['mode'] == 'ipalias') {
                         $aliaslist[$vip['subnet']] = ($vip['descr'] ?? '') . ' (' . $vip['subnet'] . ')';
                       }
                     } ?>