From b76a5c94cfeb1a7bad8ac5c818ed3065a4d32210 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 5 Jul 2024 08:47:54 +0200
Subject: wireless: T6496: use mac-address validator on BSSID and move it up
 one CLI level

(cherry picked from commit 0c9499c5b3f7cc053c1f29ecf28d679c1a3156e2)
---
 data/templates/wifi/wpa_supplicant.conf.j2       |  4 ++--
 interface-definitions/interfaces_wireless.xml.in | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/data/templates/wifi/wpa_supplicant.conf.j2 b/data/templates/wifi/wpa_supplicant.conf.j2
index 8839663e1..04088e1ad 100644
--- a/data/templates/wifi/wpa_supplicant.conf.j2
+++ b/data/templates/wifi/wpa_supplicant.conf.j2
@@ -89,7 +89,7 @@ network={
     key_mgmt=NONE
 {%     endif %}
 {% endif %}
-{% if security.bssid is vyos_defined %}
-    bssid={{ security.bssid }}
+{% if bssid is vyos_defined %}
+    bssid={{ bssid }}
 {% endif %}
 }
diff --git a/interface-definitions/interfaces_wireless.xml.in b/interface-definitions/interfaces_wireless.xml.in
index 7016eaa24..474953500 100644
--- a/interface-definitions/interfaces_wireless.xml.in
+++ b/interface-definitions/interfaces_wireless.xml.in
@@ -759,15 +759,6 @@
               <help>Wireless security settings</help>
             </properties>
             <children>
-              <leafNode name="bssid">
-                <properties>
-                  <help>Basic Service Set Identifier (BSSID)</help>
-                  <constraint>
-                    <regex>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
-                </properties>
-              </leafNode>
               <node name="station-address">
                 <properties>
                   <help>Station MAC address based authentication</help>
@@ -986,6 +977,19 @@
               <constraintErrorMessage>Invalid SSID</constraintErrorMessage>
             </properties>
           </leafNode>
+          <leafNode name="bssid">
+            <properties>
+              <help>Basic Service Set Identifier (BSSID) - currently station mode only</help>
+              <valueHelp>
+                <format>macaddr</format>
+                <description>BSSID (MAC) address</description>
+              </valueHelp>
+              <constraint>
+                <validator name="mac-address"/>
+              </constraint>
+              <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
+            </properties>
+          </leafNode>
           <leafNode name="type">
             <properties>
               <help>Wireless device type for this interface</help>
-- 
cgit v1.2.3