lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: look up port conflict via service framework

Browse Source
This commit is contained in:
Franco Fichtner 2023-03-24 13:32:21 +01:00
parent 68f781f430
commit 4cd1b72d4d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/www/services_dnsmasq.php
View File

@ -82,12 +82,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (isset($pconfig['local_ttl']) && $pconfig['local_ttl'] !== '' && !is_numericint($pconfig['local_ttl'])) {
$input_errors[] = gettext("You must specify a valid TTL for local DNS");
}
$unbound_mdl = new \OPNsense\Unbound\Unbound();
$unbound_enabled = (string)$unbound_mdl->general->enabled;
$unbound_port = (string)$unbound_mdl->general->port;
$dnsmasq_port = empty($pconfig['port']) ? "53" : $pconfig['port'];
if (!empty($pconfig['enable']) && !empty($unbound_enabled) && $dnsmasq_port == $unbound_port) {
$input_errors[] = gettext('Unbound is still active on the same port. Disable it before enabling Dnsmasq.');
$port_conflict = service_by_name('*', ['ports' => [$dnsmasq_port]]);
if (!empty($pconfig['enable']) && !empty($port_conflict)) {
$input_errors[] = sprintf(gettext('%s is currently using this port.'), $port_conflict['description']);
}
if (count($input_errors) == 0) {