Allow for failover DynDNS hostnames.

replace get_real_interface() calls with get_failover_interface. If it isn't a group we call get_real_interface() anyhow.
We can't put the logic inside get_real_interface() as this would create a recursion
Redmine ticket #1965

2 files changed, 11 insertions, 5 deletions

diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php
index 14402c9..b4fdc32 100755
--- a/usr/local/www/services_dyndns.php
+++ b/usr/local/www/services_dyndns.php
@@ -119,13 +119,15 @@ include("head.inc");
 	  		foreach ($iflist as $if => $ifdesc) {
 				if ($dyndns['interface'] == $if) {
 					echo "{$ifdesc}";
+					$iface = $if;
 					break;
 				}
 			}
 			$groupslist = return_gateway_groups_array();
-	  		foreach ($groupslist as $name => $group) {
-				if ($dyndns['interface'] == $name) {
-					echo "{$name}";
+	  		foreach ($groupslist as $if => $group) {
+				if ($dyndns['interface'] == $if) {
+					echo "{$if}";
+					$iface = $if;
 					break;
 				}
 			}
@@ -147,8 +149,8 @@ include("head.inc");
                   </td>
                   <td class="listr">
 			<?php
-				$filename = "{$g['conf_path']}/dyndns_{$if}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache";
-				$ipaddr = dyndnsCheckIP($if);
+				$filename = "{$g['conf_path']}/dyndns_{$iface}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache";
+				$ipaddr = dyndnsCheckIP($iface);
 				if(file_exists($filename)) {
 					$cached_ip_s = explode(":", file_get_contents($filename));
 					$cached_ip = $cached_ip_s[0];
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 242e9ea..85e6e91 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -133,6 +133,10 @@ if ($_POST) {
 			$a_gateway_groups[] = $gateway_group;
 		
 		mark_subsystem_dirty('staticroutes');
+		/* perform RFC 2136 DNS update */
+		services_dnsupdate_process();
+		/* signal dyndns update */
+		services_dyndns_configure();
 		
 		write_config();