From 0f0370db486f06684c01ed465ca82cbf6b344894 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 3 Jan 2020 14:13:15 +0100
Subject: [PATCH] dns/dyndns: expect dyndns_failover_interface() to do the
 right thing

... so that we can improve dyndns_failover_interface() in a final step.

PR: https://github.com/opnsense/plugins/issues/1651
---
 dns/dyndns/src/www/services_dyndns.php                       | 4 ++--
 dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dns/dyndns/src/www/services_dyndns.php b/dns/dyndns/src/www/services_dyndns.php
index 1992053b4..03bddbfcb 100644
--- a/dns/dyndns/src/www/services_dyndns.php
+++ b/dns/dyndns/src/www/services_dyndns.php
@@ -146,14 +146,14 @@ $main_buttons = array(
                       $filename = dyndns_cache_file($dyndns, 4);
                       $fdata = '';
                       if (file_exists($filename) && !empty($dyndns['enable'])) {
-                          $ipaddr = get_dyndns_ip($dyndns['interface'], 4);
+                          $ipaddr = get_dyndns_ip(dyndns_failover_interface($dyndns['interface'], 'all'), 4);
                           $fdata = @file_get_contents($filename);
                       }
 
                       $filename_v6 = dyndns_cache_file($dyndns, 6);
                       $fdata6 = '';
                       if (file_exists($filename_v6) && !empty($dyndns['enable'])) {
-                          $ipv6addr = get_dyndns_ip($dyndns['interface'], 6);
+                          $ipv6addr = get_dyndns_ip(dyndns_failover_interface($dyndns['interface'], 'inet6'), 6);
                           $fdata6 = @file_get_contents($filename_v6);
                       }
 
diff --git a/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php b/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php
index 167d90ba1..7728dec22 100644
--- a/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php
+++ b/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php
@@ -48,14 +48,14 @@ if (!empty($_REQUEST['getdyndnsstatus'])) {
         $filename = dyndns_cache_file($dyndns, 4);
         $fdata = '';
         if (!empty($dyndns['enable']) && file_exists($filename)) {
-            $ipaddr = get_dyndns_ip($dyndns['interface'], 4);
+            $ipaddr = get_dyndns_ip(dyndns_failover_interface($dyndns['interface'], 'all'), 4);
             $fdata = @file_get_contents($filename);
         }
 
         $filename_v6 = dyndns_cache_file($dyndns, 6);
         $fdata6 = '';
         if (!empty($dyndns['enable']) && file_exists($filename_v6)) {
-            $ipv6addr = get_dyndns_ip($dyndns['interface'], 6);
+            $ipv6addr = get_dyndns_ip(dyndns_failover_interface($dyndns['interface'], 'inet6'), 6);
             $fdata6 = @file_get_contents($filename_v6);
         }