From 9335c87a6fae009994acfbb0f4dab08e1e1fd024 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 15 Sep 2021 21:23:04 +0200
Subject: [PATCH] interfaces: fix two refactors and remove irrelevant XXX #4749

---
 src/etc/inc/interfaces.inc            | 2 --
 src/etc/inc/plugins.inc.d/dpinger.inc | 4 ++--
 src/etc/rc.filter_synchronize         | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 1fefcfcf5..376c40dba 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -3960,7 +3960,6 @@ function ip_in_interface_alias_subnet($interface, $ipalias)
 
 function get_interface_ip($interface = 'wan', $ifconfig_details = null)
 {
-    /* XXX maybe we should make a proper lookup */
     if (strstr($interface, '_vip')) {
         return get_configured_carp_interface_list($interface);
     }
@@ -3972,7 +3971,6 @@ function get_interface_ip($interface = 'wan', $ifconfig_details = null)
 
 function get_interface_ipv6($interface = 'wan', $ifconfig_details = null)
 {
-    /* XXX maybe we should make a proper lookup */
     if (strstr($interface, '_vip')) {
         return get_configured_carp_interface_list($interface, 'inet6');
     }
diff --git a/src/etc/inc/plugins.inc.d/dpinger.inc b/src/etc/inc/plugins.inc.d/dpinger.inc
index fd5b1112d..d3a8a4410 100644
--- a/src/etc/inc/plugins.inc.d/dpinger.inc
+++ b/src/etc/inc/plugins.inc.d/dpinger.inc
@@ -175,9 +175,9 @@ function dpinger_configure_do($verbose = false, $gwname = null)
         } elseif ($gateway['ipprotocol'] == "inet6") { // This is an IPv6 gateway...
             if (is_linklocal($gateway['monitor'])) {
                 /* link local monitor needs a link local address for the "src" part */
-                $gwifip = interfaces_scoped_address6($gateway['if'], null, $ifconfig_details);
+                list ($gwifip) = interfaces_scoped_address6($gateway['if'], null, $ifconfig_details);
             } else {
-                $gwifip = interfaces_primary_address6($gateway['if'], null, $ifconfig_details);
+                list ($gwifip) = interfaces_primary_address6($gateway['if'], null, $ifconfig_details);
             }
 
             if (empty($gwifip)) {
diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize
index 323b86890..e01d2b488 100755
--- a/src/etc/rc.filter_synchronize
+++ b/src/etc/rc.filter_synchronize
@@ -187,8 +187,7 @@ function carp_sync_xml($url, $username, $password, $sections, $debug)
         foreach($transport_data['dhcpd'] as $dhcpif => $dhcpifconf) {
             if (isset($dhcpifconf['failover_peerip']) && $dhcpifconf['failover_peerip'] != '') {
                 $int = guess_interface_from_ip($dhcpifconf['failover_peerip']);
-                $intip = interfaces_primary_address($int);
-                $transport_data['dhcpd'][$dhcpif]['failover_peerip'] = $intip;
+                $transport_data['dhcpd'][$dhcpif]['failover_peerip'] = get_interface_ip($int);
             }
         }
     }