From f35e3e3efe4c724f19594e2a41772b329d890cb8 Mon Sep 17 00:00:00 2001 From: Guillaume Mazoyer Date: Mon, 13 Jun 2016 11:41:49 +0200 Subject: Fix hostname_to_ip_address. Get only AAAA or A record based on the router config if provided. --- includes/utils.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'includes/utils.php') diff --git a/includes/utils.php b/includes/utils.php index 0fbf3f7..e8a7098 100644 --- a/includes/utils.php +++ b/includes/utils.php @@ -242,17 +242,15 @@ function match_aspath_regex($aspath_regex) { * databases. * @return string an IPv6 or IPv4 address based on the DNS records. */ -function hostname_to_ip_address($hostname) { - global $config; - +function hostname_to_ip_address($hostname, $config = null) { $record_types = DNS_AAAA + DNS_A; // IPv6 is disabled look for A records only - if ($config['misc']['disable_ipv6']) { + if (($config != null) && $config['disable_ipv6']) { $record_types = DNS_A; } // IPv4 is disabled look for AAAA records only - if ($config['misc']['disabke_ipv4']) { + if (($config != null) && $config['disable_ipv4']) { $record_types = DNS_AAAA; } -- cgit v1.2.3