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

dnsmasq: Create three more optional parameters (#6333)

Browse Source 
Add dns_forward_max, cache_size and local_ttl to dnsmasq configuration
This commit is contained in:
Dr. Uwe Meyer-Gruhl 2023-02-17 08:38:28 +01:00 committed by GitHub
parent 7ebe361340
commit 95fc53a1d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/etc/inc/plugins.inc.d/dnsmasq.inc
View File

@ -186,9 +186,24 @@ function dnsmasq_configure_do($verbose = false)
$args .= ' --no-hosts ';
}
$args .= ' --dns-forward-max=5000 ';
$args .= ' --cache-size=10000 ';
$args .= ' --local-ttl=1 ';
if (isset($config['dnsmasq']['dns_forward_max']) && is_numericint($config['dnsmasq']['dns_forward_max'])) {
$args .= " --dns-forward-max={$config['dnsmasq']['dns_forward_max']} ";
} else {
$args .= ' --dns-forward-max=5000 ';
}
if (isset($config['dnsmasq']['cache_size']) && is_numericint($config['dnsmasq']['cache_size'])) {
$args .= " --cache-size={$config['dnsmasq']['cache_size']} ";
} else {
$args .= ' --cache-size=10000 ';
}
if (isset($config['dnsmasq']['local_ttl']) && is_numericint($config['dnsmasq']['local_ttl'])) {
$args .= " --local-ttl={$config['dnsmasq']['local_ttl']} ";
} else {
$args .= ' --local-ttl=1 ';
}
$args .= ' --conf-dir=/usr/local/etc/dnsmasq.conf.d,\*.conf ';
_dnsmasq_add_host_entries();

54
src/www/services_dnsmasq.php
View File

@ -52,6 +52,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['no_hosts'] = isset($a_dnsmasq['no_hosts']);
// simple text types
$pconfig['port'] = !empty($a_dnsmasq['port']) ? $a_dnsmasq['port'] : "";
$pconfig['dns_forward_max'] = !empty($a_dnsmasq['dns_forward_max']) ? $a_dnsmasq['dns_forward_max'] : "";
$pconfig['cache_size'] = !empty($a_dnsmasq['cache_size']) ? $a_dnsmasq['cache_size'] : "";
$pconfig['local_ttl'] = !empty($a_dnsmasq['local_ttl']) ? $a_dnsmasq['local_ttl'] : "";
// arrays
$pconfig['interface'] = !empty($a_dnsmasq['interface']) ? explode(",", $a_dnsmasq['interface']) : array();
@ -66,6 +69,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (!empty($pconfig['port']) && !is_port($pconfig['port'])) {
$input_errors[] = gettext("You must specify a valid port number");
}
if (!empty($pconfig['dns_forward_max']) && !is_numericint($pconfig['dns_forward_max'])) {
$input_errors[] = gettext("You must specify a valid maximum number of DNS queries");
}
if (!empty($pconfig['cache_size']) && !is_numericint($pconfig['cache_size'])) {
$input_errors[] = gettext("You must specify a valid cache size");
}
if (!empty($pconfig['local_ttl']) && !is_numericint($pconfig['local_ttl'])) {
$input_errors[] = gettext("You must specify a valid TTL for local DNS");
}
$unbound_port = empty($config['unbound']['port']) ? "53" : $config['unbound']['port'];
$dnsmasq_port = empty($pconfig['port']) ? "53" : $pconfig['port'];
if (!empty($pconfig['enable']) && isset($config['unbound']['enable']) && $dnsmasq_port == $unbound_port) {
@ -100,6 +112,21 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} elseif (isset($a_dnsmasq['port'])) {
unset($a_dnsmasq['port']);
}
if (!empty($pconfig['dns_forward_max'])) {
$a_dnsmasq['dns_forward_max'] = $pconfig['dns_forward_max'];
} elseif (isset($a_dnsmasq['dns_forward_max'])) {
unset($a_dnsmasq['dns_forward_max']);
}
if (!empty($pconfig['cache_size'])) {
$a_dnsmasq['cache_size'] = $pconfig['cache_size'];
} elseif (isset($a_dnsmasq['cache_size'])) {
unset($a_dnsmasq['cache_size']);
}
if (!empty($pconfig['local_ttl'])) {
$a_dnsmasq['local_ttl'] = $pconfig['local_ttl'];
} elseif (isset($a_dnsmasq['local_ttl'])) {
unset($a_dnsmasq['local_ttl']);
}
write_config();
system_resolvconf_generate();
dnsmasq_configure_do();
@ -371,6 +398,33 @@ $( document ).ready(function() {
<?= gettext('Log the results of DNS queries') ?>
</td>
</tr>
<tr>
<td><a id="help_for_dns_forward_max" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Max number DNS queries");?></td>
<td>
<input name="dns_forward_max" type="text" id="dns_forward_max" size="6" placeholder="5000" <?=!empty($pconfig['dns_forward_max']) ? "value=\"{$pconfig['dns_forward_max']}\"" : "";?> />
<div class="hidden" data-for="help_for_dns_forward_max">
<?=gettext("The maximum number of forwarded DNS queries");?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_cache_size" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Cache size");?></td>
<td>
<input name="cache_size" type="text" id="cache_size" size="8" placeholder="10000" <?=!empty($pconfig['cache_size']) ? "value=\"{$pconfig['cache_size']}\"" : "";?> />
<div class="hidden" data-for="help_for_cache_size">
<?=gettext("The number of entries in DNS cache");?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_local_ttl" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("TTL for local DNS");?></td>
<td>
<input name="local_ttl" type="text" id="local_ttl" size="5" placeholder="1" <?=!empty($pconfig['local_ttl']) ? "value=\"{$pconfig['local_ttl']}\"" : "";?> />
<div class="hidden" data-for="help_for_local_ttl">
<?=gettext("The Time-To-Live in seconds for local DNS entries, i.e. /etc/hosts or DHCP leases");?>
</div>
</td>
</tr>
<tr>
<td></td>
<td>