diff --git a/LICENSE b/LICENSE index b47b3f890..6da3cfdf3 100644 --- a/LICENSE +++ b/LICENSE @@ -18,6 +18,7 @@ Copyright (c) 2015 Jos Schellevis Copyright (c) 2018 João Vilaça Copyright (c) 2019 Juergen Kellerer Copyright (c) 2003-2006 Manuel Kasper +Copyright (c) 2020 Martin Wasley Copyright (c) 2017-2020 Michael Muenz Copyright (c) 2004-2012 Scott Ullrich Copyright (c) 2010-2012 Seth Mos diff --git a/README.md b/README.md index 514ce14fc..199d6918b 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/net/udpbroadcastrelay/Makefile b/net/udpbroadcastrelay/Makefile index 22783a489..b90f1cfd0 100644 --- a/net/udpbroadcastrelay/Makefile +++ b/net/udpbroadcastrelay/Makefile @@ -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 diff --git a/net/udpbroadcastrelay/pkg-descr b/net/udpbroadcastrelay/pkg-descr index 1a1c37af0..684ef947f 100644 --- a/net/udpbroadcastrelay/pkg-descr +++ b/net/udpbroadcastrelay/pkg-descr @@ -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) diff --git a/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc b/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc index 1a3b3aa82..d859316fc 100644 --- a/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc +++ b/net/udpbroadcastrelay/src/etc/inc/plugins.inc.d/udpbroadcastrelay.inc @@ -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; } diff --git a/net/udpbroadcastrelay/src/etc/rc.d/os-udpbroadcastrelay b/net/udpbroadcastrelay/src/etc/rc.d/os-udpbroadcastrelay index d076d6901..e16cab0c3 100644 --- a/net/udpbroadcastrelay/src/etc/rc.d/os-udpbroadcastrelay +++ b/net/udpbroadcastrelay/src/etc/rc.d/os-udpbroadcastrelay @@ -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" diff --git a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php index 8f08921d3..48c76094e 100644 --- a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php +++ b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/Api/SettingsController.php @@ -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( diff --git a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/forms/dialogEdit.xml b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/forms/dialogEdit.xml index f39ae5111..f8e5a0cdd 100644 --- a/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/forms/dialogEdit.xml +++ b/net/udpbroadcastrelay/src/opnsense/mvc/app/controllers/OPNsense/UDPBroadcastRelay/forms/dialogEdit.xml @@ -21,8 +21,8 @@ udpbroadcastrelay.multicastaddress select_multiple - true - + true + diff --git a/net/udpbroadcastrelay/src/opnsense/mvc/app/views/OPNsense/UDPBroadcastRelay/index.volt b/net/udpbroadcastrelay/src/opnsense/mvc/app/views/OPNsense/UDPBroadcastRelay/index.volt index 1904a3145..f8c106948 100644 --- a/net/udpbroadcastrelay/src/opnsense/mvc/app/views/OPNsense/UDPBroadcastRelay/index.volt +++ b/net/udpbroadcastrelay/src/opnsense/mvc/app/views/OPNsense/UDPBroadcastRelay/index.volt @@ -91,7 +91,7 @@ POSSIBILITY OF SUCH DAMAGE. {{ lang._('Interfaces') }} {{ lang._('Multicast Addresses') }} {{ lang._('Source Address') }} - {{ lang._('Listen Port') }} + {{ lang._('Listen Port') }} {{ lang._('ID') }} {{ lang._('Description') }} {{ lang._('ID') }}