From ceb90928aa47e94564742afcc65d8ecdcf9e3fa9 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Thu, 2 Mar 2017 10:21:09 -0300
Subject: Use the same cache filename pattern for RFC2136 IPv6 items as used by
 dyndns

---
 src/etc/inc/services.inc               | 2 +-
 src/usr/local/www/services_rfc2136.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 7833571..fdb0d4b 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2574,7 +2574,7 @@ function services_dnsupdate_process($int = "", $updatehost = "", $forced = false
 
 			$wanipv6 = get_interface_ipv6($if);
 			$cacheFile = "{$g['conf_path']}/dyndns_{$dnsupdate['interface']}_rfc2136_" . escapeshellarg($dnsupdate['host']) . "_{$dnsupdate['server']}.cache";
-			$cacheFilev6 = $cacheFile . ".ipv6";
+			$cacheFilev6 = "{$g['conf_path']}/dyndns_{$dnsupdate['interface']}_rfc2136_" . escapeshellarg($dnsupdate['host']) . "_{$dnsupdate['server']}_v6.cache";
 			$currentTime = time();
 
 			if ($wanip || $wanipv6) {
diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php
index 42287ac..63dcc0d 100644
--- a/src/usr/local/www/services_rfc2136.php
+++ b/src/usr/local/www/services_rfc2136.php
@@ -153,6 +153,7 @@ foreach ($a_rfc2136 as $rfc2136):
 							<td>
 <?php
 	$filename = "{$g['conf_path']}/dyndns_{$rfc2136['interface']}_rfc2136_" . escapeshellarg($rfc2136['host']) . "_{$rfc2136['server']}.cache";
+	$filename_v6 = "{$g['conf_path']}/dyndns_{$rfc2136['interface']}_rfc2136_" . escapeshellarg($rfc2136['host']) . "_{$rfc2136['server']}_v6.cache";
 	$if = get_failover_interface($rfc2136['interface']);
 
 	if (file_exists($filename)) {
@@ -180,10 +181,10 @@ foreach ($a_rfc2136 as $rfc2136):
 
 	print('<br />');
 
-	if (file_exists("{$filename}.ipv6")) {
+	if (file_exists($filename_v6)) {
 		print('IPv6: ');
 		$ipaddr = get_interface_ipv6($if);
-		$cached_ip_s = explode("|", file_get_contents("{$filename}.ipv6"));
+		$cached_ip_s = explode("|", file_get_contents($filename_v6));
 		$cached_ip = $cached_ip_s[0];
 
 		if ($ipaddr != $cached_ip) {
-- 
cgit v1.1