lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: simplify nameserver lookup

Browse Source
This commit is contained in:
Franco Fichtner 2018-12-13 10:47:15 +01:00
parent 8ca8def5ac
commit 6dcb9da10f
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/etc/inc/system.inc
View File

@ -288,15 +288,23 @@ function get_searchdomains()
return array_unique($master_list);
}
function get_nameservers($realif = '')
function get_nameservers($interface = null)
{
$master_list = array();
$dns_listsv4 = array();
$dns_listsv6 = array();
$dns_listany = array();
$dns_listsv4 = glob("/var/etc/nameserver_{$realif}*");
/* XXX not a great design, please switch */
$dns_listsv6 = glob("/var/etc/nameserver_v6{$realif}*");
if (!empty($interface)) {
$realif = get_real_interface($interface);
$dns_listsv4 = glob("/var/etc/nameserver_{$realif}*");
$realifv6 = get_real_interface($interface, 'inet6');
$dns_listsv6 = glob("/var/etc/nameserver_v6{$realifv6}*");
} else {
$dns_listany = glob('/var/etc/nameserver_*');
}
$dns_lists = array_unique(array_merge($dns_listsv4, $dns_listsv6));
$dns_lists = array_unique(array_merge($dns_listany, $dns_listsv4, $dns_listsv6));
foreach ($dns_lists as $fdns) {
$contents = file($fdns, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);

4
src/www/status_interfaces.php
View File

@ -330,9 +330,7 @@ include("head.inc");
</tr>
<?php
endif;
$dnsv4 = get_nameservers(get_real_interface($ifdescr));
$dnsv6 = get_nameservers(get_real_interface($ifdescr, 'inet6'));
$dnsall = array_unique(array_merge($dnsv4, $dnsv6));
$dnsall = get_nameservers($ifdescr);
if (count($dnsall)): ?>
<tr>
<td><?= gettext("DNS servers") ?></td>