mirror of
https://github.com/netbirdio/plugins.git
synced 2026-05-22 18:44:07 -07:00
net/udpbroadcastdelay: style sweep, align Makefile
This commit is contained in:
Franco Fichtner
@@ -18,6 +18,7 @@ Copyright (c) 2015 Jos Schellevis
|
||||
Copyright (c) 2018 João Vilaça <machadovilaca@gmail.com>
|
||||
Copyright (c) 2019 Juergen Kellerer
|
||||
Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net>
|
||||
Copyright (c) 2020 Martin Wasley
|
||||
Copyright (c) 2017-2020 Michael Muenz <m.muenz@gmail.com>
|
||||
Copyright (c) 2004-2012 Scott Ullrich <sullrich@gmail.com>
|
||||
Copyright (c) 2010-2012 Seth Mos <seth.mos@dds.nl>
|
||||
|
||||
@@ -69,6 +69,7 @@ net/relayd -- Relayd Load Balancer
|
||||
net/shadowsocks -- Secure socks5 proxy
|
||||
net/siproxd -- Siproxd is a proxy daemon for the SIP protocol
|
||||
net/tayga -- Tayga IPv6 64NAT
|
||||
net/udpbroadcastrelay -- Control ubpbroadcastrelay processes (development only)
|
||||
net/upnp -- Universal Plug and Play Service
|
||||
net/vnstat -- vnStat is a console-based network traffic monitor
|
||||
net/wireguard -- WireGuard VPN service
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
PLUGIN_NAME= os-udpbroadcastrelay
|
||||
PLUGIN_VERSION= 0.7
|
||||
PLUGIN_DEVEL= YES
|
||||
PLUGIN_NAME= udpbroadcastrelay
|
||||
PLUGIN_VERSION= 0.1
|
||||
PLUGIN_DEVEL= yes
|
||||
PLUGIN_COMMENT= Control ubpbroadcastrelay processes
|
||||
PLUGIN_DEPENDS= udpbroadcastrelay
|
||||
PLUGIN_MAINTAINER= mjwasley@gmail.com
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
udbproadcastrelay is a UDP multicast relayer. Its intended use is to
|
||||
rebroadbcast udp packets on a specific port across interfaces, be those
|
||||
interfaces physical or VLAN.
|
||||
interfaces physical or VLAN.
|
||||
|
||||
It is used where devices such as Sonos or Sky are spread accross
|
||||
It is used where devices such as Sonos or Sky are spread accross
|
||||
different subnets and are not able to detect the servers or devices.
|
||||
|
||||
Examples of different devices and the ports are as follows:
|
||||
|
||||
Syncthing discovery
|
||||
Syncthing discovery
|
||||
udp_vars="--id 1 --port 21027 --dev igb1 --dev igb2"
|
||||
|
||||
mDNS / Broadcast DNS (Chromecast Discovery + Bonjour + More)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
|
||||
function udpbroadcastrelay_enabled()
|
||||
{
|
||||
$model = new \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay();
|
||||
@@ -53,17 +53,17 @@ function udpbroadcastrelay_services()
|
||||
if (!udpbroadcastrelay_enabled()) {
|
||||
return $services;
|
||||
}
|
||||
|
||||
|
||||
$model = new \OPNsense\UDPBroadcastRelay\UDPBroadcastRelay();
|
||||
|
||||
foreach ($model->udpbroadcastrelay->iterateItems() as $server) {
|
||||
|
||||
|
||||
if ($server->enabled == '0'){
|
||||
continue;
|
||||
}
|
||||
|
||||
$services[] = array(
|
||||
|
||||
|
||||
'description' => $server->description,
|
||||
'id' => $server->InstanceID,
|
||||
'pidfile' => "/var/run/udpbroadcastrelay_{$server->InstanceID}.pid",
|
||||
@@ -71,13 +71,13 @@ function udpbroadcastrelay_services()
|
||||
'restart' => array('udpbroadcastrelay restart '.$server->InstanceID),
|
||||
'start' => array('udpbroadcastrelay start '.$server->InstanceID),
|
||||
'stop' => array('udpbroadcastrelay stop '.$server->InstanceID),
|
||||
|
||||
|
||||
),
|
||||
|
||||
|
||||
'name' => 'udpbroadcastrelay',
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
||||
return $services;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ udpbroadcastrelay_reload () {
|
||||
# get instance flags
|
||||
instance_flags="${line#*udpbroadcastrelay}"
|
||||
# check if it should run
|
||||
echo
|
||||
echo
|
||||
eval osudpbroadcastrelay_flags=\$osudpbroadcastrelay_${instance}
|
||||
|
||||
if [ -n "$osudpbroadcastrelay_flags" -a "$osudpbroadcastrelay_flags" = "$instance_flags" ]; then
|
||||
@@ -94,9 +94,9 @@ udpbroadcastrelay_reload () {
|
||||
udpbroadcastrelay_stop
|
||||
done
|
||||
# start configured instances
|
||||
|
||||
|
||||
if [ -n "$osudpbroadcastrelay_instances" ]; then
|
||||
|
||||
|
||||
for i in $osudpbroadcastrelay_instances; do
|
||||
eval osudpbroadcastrelay_flags=\$osudpbroadcastrelay_${i}
|
||||
pidfile="/var/run/udpbroadcastrelay_$i.pid"
|
||||
|
||||
+7
-7
@@ -99,7 +99,7 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
|
||||
if (count($result['validations']) == 0) {
|
||||
// check for duplicates
|
||||
|
||||
|
||||
foreach ($CurrentProxies['udpbroadcastrelay'] as $CurrentUUID => &$CurrentRelay) {
|
||||
if (
|
||||
$node->InstanceID->__toString() == $CurrentRelay['InstanceID'] &&
|
||||
@@ -135,7 +135,7 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
"udpbroadcastrelay.InstanceID" => "Instance ID already In use."
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
$result = count(explode(',',$node->interfaces));
|
||||
if (
|
||||
$result < 2 &&
|
||||
@@ -147,9 +147,9 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
"udpbroadcastrelay.interfaces" => "At least two interfaces must be selected."
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// save config if validated correctly
|
||||
$mdlUDPBroadcastRelay->serializeToConfig();
|
||||
Config::getInstance()->save();
|
||||
@@ -189,7 +189,7 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
foreach ($CurrentProxies['udpbroadcastrelay'] as &$CurrentRelay) {
|
||||
if (
|
||||
$node->InstanceID->__toString() == $CurrentRelay['InstanceID'] &&
|
||||
$node->listenport->__toString() == $CurrentRelay['listenport']
|
||||
$node->listenport->__toString() == $CurrentRelay['listenport']
|
||||
) {
|
||||
return array(
|
||||
"result" => "failed",
|
||||
@@ -219,9 +219,9 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
$result = count(explode(',',$node->interfaces));
|
||||
if (
|
||||
if (
|
||||
$result < 2
|
||||
) {
|
||||
return array(
|
||||
|
||||
+2
-2
@@ -21,8 +21,8 @@
|
||||
<id>udpbroadcastrelay.multicastaddress</id>
|
||||
<label>Broadcast Address</label>
|
||||
<type>select_multiple</type>
|
||||
<allownew>true</allownew>
|
||||
<style>tokenize</style>
|
||||
<allownew>true</allownew>
|
||||
<style>tokenize</style>
|
||||
<help><![CDATA[Multicast addresses to use on this port when relaying multicast packets. e.g Sonos is 239.255.255.250, you may enter multiple addresses.]]></help>
|
||||
</field>
|
||||
<field>
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
<th data-column-id="interfaces" data-width="10em" data-type="string" data-visible="true">{{ lang._('Interfaces') }}</th>
|
||||
<th data-column-id="multicastaddress" data-width="15em" data-type="string" data-visible="true">{{ lang._('Multicast Addresses') }}</th>
|
||||
<th data-column-id="sourceaddress" data-width="11em" data-type="string" data-visible="true">{{ lang._('Source Address') }}</th>
|
||||
<th data-column-id="listenport" data-width="8em" data-type="string" data-visible="true">{{ lang._('Listen Port') }}</th>
|
||||
<th data-column-id="listenport" data-width="8em" data-type="string" data-visible="true">{{ lang._('Listen Port') }}</th>
|
||||
<th data-column-id="InstanceID" data-width="6em" data-type="string" data-visible="true">{{ lang._('ID') }}</th>
|
||||
<th data-column-id="description" data-width="15em" data-type="string">{{ lang._('Description') }}</th>
|
||||
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
|
||||
|
||||
Reference in New Issue
Block a user