From 6ffad1bb73da9db36c409130fcf00a9af286f94f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 24 May 2026 10:15:20 +0200
Subject: [PATCH] Firewall - fix interface sortng by value for live-log and
 groups, closes https://github.com/opnsense/core/issues/10348

We might consider moving the sorting logic to BaseListField at some point as most cases expect sort by value anyway and we only have a couple of exceptions to that logic.
---
 .../OPNsense/Diagnostics/Api/InterfaceController.php           | 3 ++-
 .../app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
index 3bf577ce47..125396e60f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2016 Deciso B.V.
+ * Copyright (C) 2016-2026 Deciso B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@ class InterfaceController extends ApiControllerBase
                 $intfmap[(string)$node->if] = !empty((string)$node->descr) ? (string)$node->descr : strtoupper($key);
             }
         }
+        natcasesort($intfmap);
         return $intfmap;
     }
 
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php
index 2c6fad42c3..49598ab18d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2023 Deciso B.V.
+ * Copyright (C) 2023-2026 Deciso B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,7 @@ class InterfaceField extends BaseListField
             }
         }
         $this->internalOptionList = self::$parent_interfaces;
+        natcasesort($this->internalOptionList);
         return parent::actionPostLoadingEvent();
     }
 }