upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-09 17:02:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/udpbroadcastrelay: fix value access in model

Browse source 
PR: https://forum.opnsense.org/index.php?topic=33294.0
This commit is contained in:
Franco Fichtner 2023-03-29 15:17:57 +02:00
parent 410cb9dbf8
commit c08a2ea177
2 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/udpbroadcastrelay/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= udpbroadcastrelay
PLUGIN_VERSION= 1.0
PLUGIN_REVISION= 2
PLUGIN_REVISION= 3
PLUGIN_COMMENT= Control ubpbroadcastrelay processes
PLUGIN_DEPENDS= udpbroadcastrelay
PLUGIN_MAINTAINER= mjwasley@gmail.com

63
net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc
View file

@ -1,29 +1,29 @@
<?php
/*
* Copyright (C) 2020 Martin Wasley
* All rights reserved.
* Copyright (C) 2020 Martin Wasley
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
function udpbroadcastrelay_enabled()
@ -31,7 +31,7 @@ function udpbroadcastrelay_enabled()
$model = new \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay();
foreach ($model->udpbroadcastrelay->iterateItems() as $server) {
if ($server->enabled == '1') {
if ((string)$server->enabled == '1') {
return true;
}
}
@ -48,7 +48,7 @@ function udpbroadcastrelay_firewall($fw)
function udpbroadcastrelay_services()
{
$services = array();
$services = [];
if (!udpbroadcastrelay_enabled()) {
return $services;
@ -57,22 +57,21 @@ function udpbroadcastrelay_services()
$model = new \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay();
foreach ($model->udpbroadcastrelay->iterateItems() as $server) {
if ($server->enabled == '0') {
if ((string)$server->enabled == '0') {
continue;
}
$services[] = array(
'description' => $server->description,
'id' => $server->InstanceID,
$services[] = [
'description' => (string)$server->description,
'id' => (string)$server->InstanceID,
'pidfile' => "/var/run/udpbroadcastrelay_{$server->InstanceID}.pid",
'configd' => array(
'restart' => array('udpbroadcastrelay restart ' . $server->InstanceID),
'start' => array('udpbroadcastrelay start ' . $server->InstanceID),
'stop' => array('udpbroadcastrelay stop ' . $server->InstanceID),
),
'configd' => [
'restart' => ['udpbroadcastrelay restart ' . $server->InstanceID],
'start' => ['udpbroadcastrelay start ' . $server->InstanceID],
'stop' => ['udpbroadcastrelay stop ' . $server->InstanceID],
],
'name' => 'udpbroadcastrelay',
);
];
}
return $services;