From 497dacc78fd6d4411f28f19ecc65a2363fc594e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraj=20Andr=C3=A1ssy?=
 <10706773+JAndrassy@users.noreply.github.com>
Date: Sat, 4 Nov 2023 23:29:06 +0100
Subject: [PATCH] WiFi.BSSID and scan result BSSID with parameter as other WiFi
 libraries (#9008)

---
 libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp  | 12 ++++++++++++
 libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h    |  1 +
 libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp | 15 +++++++++++++++
 libraries/ESP8266WiFi/src/ESP8266WiFiScan.h   |  1 +
 4 files changed, 29 insertions(+)

diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
index bfba96457d..c27000182c 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
@@ -607,6 +607,18 @@ uint8_t* ESP8266WiFiSTAClass::BSSID(void) {
     return reinterpret_cast<uint8_t*>(conf.bssid);
 }
 
+/**
+ * Fill the current bssid / mac associated with the network if configured
+ * @param bssid  pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
+ * @return bssid uint8_t *
+ */
+uint8_t* ESP8266WiFiSTAClass::BSSID(uint8_t* bssid) {
+    struct station_config conf;
+    wifi_station_get_config(&conf);
+    memcpy(bssid, conf.bssid, WL_MAC_ADDR_LENGTH);
+    return bssid;
+}
+
 /**
  * Return the current bssid / mac associated with the network if configured
  * @return String bssid mac
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
index 0c1150a8e4..11f188a6d3 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
@@ -79,6 +79,7 @@ class ESP8266WiFiSTAClass: public LwipIntf {
         String psk() const;
 
         uint8_t * BSSID();
+        uint8_t * BSSID(uint8_t* bssid);
         String BSSIDstr();
 
         int8_t RSSI();
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp
index 5331c7bac8..1fdc6e04c7 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp
@@ -259,6 +259,21 @@ uint8_t * ESP8266WiFiScanClass::BSSID(uint8_t i) {
     return it->bssid;
 }
 
+/**
+ * fill MAC / BSSID of scanned wifi
+ * @param i specify from which network item want to get the information
+ * @param bssid  pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
+ * @return uint8_t * MAC / BSSID of scanned wifi
+ */
+uint8_t * ESP8266WiFiScanClass::BSSID(uint8_t i, uint8_t* bssid) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return 0;
+    }
+    memcpy(bssid, it->bssid, WL_MAC_ADDR_LENGTH);
+    return bssid;
+}
+
 /**
  * return MAC / BSSID of scanned wifi
  * @param i specify from which network item want to get the information
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.h b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.h
index 36d159aca0..1c9c3a7408 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.h
@@ -48,6 +48,7 @@ class ESP8266WiFiScanClass {
         uint8_t encryptionType(uint8_t networkItem);
         int32_t RSSI(uint8_t networkItem);
         uint8_t * BSSID(uint8_t networkItem);
+        uint8_t * BSSID(uint8_t networkItem, uint8_t* bssid);
         String BSSIDstr(uint8_t networkItem);
         int32_t channel(uint8_t networkItem);
         bool isHidden(uint8_t networkItem);