netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

dns/rfc2136: remove get_interface_ip(v6) use

Browse Source
This commit is contained in:
Franco Fichtner
2023-09-18 11:09:58 +02:00
parent 834a0dfa55
commit bea60a2883
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dns/rfc2136/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
PLUGIN_NAME= rfc2136
PLUGIN_VERSION= 1.8
PLUGIN_REVISION= 1
PLUGIN_REVISION= 2
PLUGIN_COMMENT= RFC-2136 Support
PLUGIN_MAINTAINER= franco@opnsense.org
PLUGIN_DEPENDS= bind-tools
dns/rfc2136/src/etc/inc/plugins.inc.d/rfc2136.inc
+4 -7
View File
@@ -151,7 +151,7 @@ function rfc2136_configure_do($verbose = false, $int = '', $updatehost = '', $fo
if (isset($dnsupdate['usepublicip'])) {
$wanip = get_rfc2136_ip_address($dnsupdate['interface'], 4);
} else {
$wanip = get_interface_ip($dnsupdate['interface']);
list ($wanip) = interfaces_primary_address($dnsupdate['interface']);
}
if (is_ipaddrv4($wanip)) {
if (($wanip != $cachedipv4) || (($currentTime - $cacheTimev4) > $maxCacheAgeSecs) || $forced) {
@@ -178,7 +178,7 @@ function rfc2136_configure_do($verbose = false, $int = '', $updatehost = '', $fo
if (isset($dnsupdate['usepublicip'])) {
$wanipv6 = get_rfc2136_ip_address($dnsupdate['interface'], 6);
} else {
$wanipv6 = get_interface_ipv6($dnsupdate['interface']);
list ($wanipv6) = interfaces_primary_address6($dnsupdate['interface']);
}
if (is_ipaddrv6($wanipv6)) {
if (($wanipv6 != $cachedipv6) || (($currentTime - $cacheTimev6) > $maxCacheAgeSecs) || $forced) {
@@ -216,19 +216,16 @@ function rfc2136_configure_do($verbose = false, $int = '', $updatehost = '', $fo
function get_rfc2136_ip_address($int, $ipver = 4)
{
$ip_address = $ipver == 6 ? get_interface_ipv6($int) : get_interface_ip($int);
list ($ip_address) = $ipver == 6 ? interfaces_primary_address6($int) : interfaces_primary_address($int);
if (empty($ip_address)) {
log_error("Aborted IPv{$ipver} detection: no address for {$int}");
return 'down';
}
if ($ipver != 6 && is_private_ip($ip_address)) {
/* Chinese alternative is http://ip.3322.net/ */
$hosttocheck = 'http://checkip.dyndns.org';
$ip_ch = curl_init($hosttocheck);
$ip_ch = curl_init('http://checkip.dyndns.org');
curl_setopt($ip_ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ip_ch, CURLOPT_INTERFACE, $ip_address);
curl_setopt($ip_ch, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($ip_ch, CURLOPT_TIMEOUT, 30);
curl_setopt($ip_ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
$ip_result = curl_exec($ip_ch);
dns/rfc2136/src/www/services_rfc2136.php
+2 -2
View File
@@ -148,7 +148,7 @@ legacy_html_escape_form_data($a_rfc2136);
if (isset($rfc2136['usepublicip'])) {
$ipaddr = get_rfc2136_ip_address($rfc2136['interface'], 4);
} else {
$ipaddr = get_interface_ip($rfc2136['interface']);
list ($ipaddr) = interfaces_primary_address($rfc2136['interface']);
}
$cached_ip_s = explode("|", file_get_contents($filename));
$cached_ip = $cached_ip_s[0];
@@ -169,7 +169,7 @@ legacy_html_escape_form_data($a_rfc2136);
if (isset($rfc2136['usepublicip'])) {
$ipaddr = get_rfc2136_ip_address($rfc2136['interface'], 6);
} else {
$ipaddr = get_interface_ipv6($rfc2136['interface']);
list ($ipaddr) = interfaces_primary_address6($rfc2136['interface']);
}
$cached_ip_s = explode("|", file_get_contents($filename6));
$cached_ip = $cached_ip_s[0];