diff --git a/net/wol/Makefile b/net/wol/Makefile index 4bdc753546..8e961a892e 100644 --- a/net/wol/Makefile +++ b/net/wol/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= wol -PLUGIN_VERSION= 2.5 -PLUGIN_REVISION= 4 +PLUGIN_VERSION= 2.6 PLUGIN_DEPENDS= wol PLUGIN_COMMENT= Wake on LAN Service diff --git a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php index 7b7841b5e7..f75cfe134d 100644 --- a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php +++ b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php @@ -118,7 +118,9 @@ private function wakeHostByNode($wolent, &$result) return $result; } $broadcast_ip = escapeshellarg($this->calculateSubnetBroadcast($ipaddr, $cidr)); - $result['status'] = trim($backend->configdRun("wol wake {$broadcast_ip} " . escapeshellarg((string)$wolent->mac))); + $port = escapeshellarg((string)$wolent->port); + $mac = escapeshellarg((string)$wolent->mac); + $result['status'] = trim($backend->configdRun("wol wake {$port} {$broadcast_ip} {$mac}")); } private function getInterfaceIP($if) diff --git a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/host.xml b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/host.xml index 3c00c8232e..104757982c 100644 --- a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/host.xml +++ b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/host.xml @@ -11,6 +11,12 @@ text Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx + + host.port + + text + UDP port to send the magic packet to (1-65535). + host.descr diff --git a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/wake.xml b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/wake.xml index 096dd63627..ef0f0102e2 100644 --- a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/wake.xml +++ b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/forms/wake.xml @@ -11,4 +11,10 @@ text Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx. + + wake.port + + text + UDP port to send the magic packet to (1-65535). + diff --git a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Migrations/M1_0_1.php b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Migrations/M1_0_1.php new file mode 100644 index 0000000000..949df19605 --- /dev/null +++ b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Migrations/M1_0_1.php @@ -0,0 +1,46 @@ +wolentry->iterateItems() as $host) { + $host->port = '40000'; + } + } +} diff --git a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml index 9fddd8987f..eb247c52c5 100644 --- a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml +++ b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml @@ -1,7 +1,7 @@ //wol Wake On Lan configuration - 1.0.0 + 1.0.1 @@ -16,6 +16,11 @@ 00:00:00:00:00:00 Should be 6 groups of 2 hex characters (a-fA-F0-9) separated by ':'. + + Y + 9 + UDP port must be a valid port number. + diff --git a/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt b/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt index 61dd88fd0c..61085f8555 100644 --- a/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt +++ b/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt @@ -98,10 +98,11 @@ $( document ).ready(function() {
{{ partial("layout_partials/base_form",['fields':wakeForm,'id':'frm_wol_wake'])}}
-
+
+
@@ -110,6 +111,7 @@ $( document ).ready(function() { {{ lang._('Interface') }} {{ lang._('MAC') }} + {{ lang._('Port') }} {{ lang._('Description') }} {{ lang._('Commands') }} @@ -118,7 +120,7 @@ $( document ).ready(function() { - + diff --git a/net/wol/src/opnsense/service/conf/actions.d/actions_wol.conf b/net/wol/src/opnsense/service/conf/actions.d/actions_wol.conf index 696fc145d1..1c0e3c62b4 100644 --- a/net/wol/src/opnsense/service/conf/actions.d/actions_wol.conf +++ b/net/wol/src/opnsense/service/conf/actions.d/actions_wol.conf @@ -1,6 +1,6 @@ [wake] -command:/usr/local/bin/wol -i -parameters: %s %s +command:/usr/local/bin/wol +parameters: -p %s -i %s %s type:script -description:Wake-On-LAN for host with broadcast IP and MAC -message:Waking up host %s %s +description:Wake-On-LAN for host with broadcast Port, IP and MAC +message:Waking up host on port %s with broadcast %s mac %s