From 59c1a95bfa38b2a1990d44b31597451ff5a064ef Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 23 Sep 2020 10:03:29 +0200 Subject: [PATCH] Firewall / live log: omit group type interfaces in fast selection. closes https://github.com/opnsense/core/issues/4369 --- .../OPNsense/Diagnostics/Api/FirewallController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php index 0ae47f058..884d2a8cd 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php @@ -68,9 +68,16 @@ class FirewallController extends ApiControllerBase $interfaces = []; if ($config->interfaces->count() > 0) { foreach ($config->interfaces->children() as $key => $node) { + // XXX: Omit group types since they don't link to actual interfaces. + if (isset($node->type) && (string)$node->type == 'group') { + continue; + } elseif ((string)$node->if == 'openvpn') { + continue; + } $interfaces[] = !empty((string)$node->descr) ? (string)$node->descr : $key; } } + return [ "interface_name" => $interfaces, "dir" => ["in", "out"],