diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-02 10:21:09 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-08 13:42:47 -0300 |
| commit | ceb90928aa47e94564742afcc65d8ecdcf9e3fa9 (patch) | |
| tree | bc90a107cd52d7e7a7d06de1ab53a0eb79fd2ff1 | |
| parent | 458f5aee020859ed4a81bf8d5ad0ffabb3579155 (diff) | |
| download | pfsense-ceb90928aa47e94564742afcc65d8ecdcf9e3fa9.zip pfsense-ceb90928aa47e94564742afcc65d8ecdcf9e3fa9.tar.gz | |
Use the same cache filename pattern for RFC2136 IPv6 items as used by dyndns
| -rw-r--r-- | src/etc/inc/services.inc | 2 | ||||
| -rw-r--r-- | 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) { |
