Show correct BSSID in json status instead of a "fake" one (#1689)

MaxineMuster · openshwprojects · web-flow · commit 01c029898d3e · 2025-07-10T21:51:05.000+02:00
* Add HAL_GetWiFiBSSID() and HAL_GetWiFiChannel() commands
Display correct BSSID and channel in JSON status

* Testing bssid RTL

* Typo and new try for RTL

* Fix BSSID returned

* bettter

* test

* Update hal_wifi_xradio.c

---------

Co-authored-by: Tester23 &lt;85486843+openshwprojects@users.noreply.github.com&gt;
diff --git a/src/hal/bk7231/hal_wifi_bk7231.c b/src/hal/bk7231/hal_wifi_bk7231.c
@@ -256,6 +256,40 @@ int HAL_GetWifiStrength()
 	bk_wlan_get_link_status(&linkStatus);
 	return linkStatus.wifi_strength;
 }
+// Get WiFi Information (SSID / BSSID) - e.g. to display on status page 
+/*
+// ATM there is only one SSID, so need for this code
+char* HAL_GetWiFiSSID(char* ssid){
+	if (sta_ip_is_start()){
+		LinkStatusTypeDef linkStatus;
+		bk_wlan_get_link_status(&linkStatus);
+//		memcpy(ssid, linkStatus.ssid, sizeof(ssid)-1);
+		strcpy(ssid,linkStatus.ssid);
+		return ssid;	
+	}
+	ssid[0]='\0';
+	return ssid; 
+};
+*/
+char* HAL_GetWiFiBSSID(char* bssid){
+	if (sta_ip_is_start()){
+		LinkStatusTypeDef linkStatus;
+		bk_wlan_get_link_status(&linkStatus);
+		sprintf(bssid, MACSTR, MAC2STR(linkStatus.bssid));
+		return bssid;
+	}
+	bssid[0]='\0';
+	return bssid; 
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	if (sta_ip_is_start()){
+		LinkStatusTypeDef linkStatus;
+		bk_wlan_get_link_status(&linkStatus);
+		*chan = linkStatus.channel ;
+		return *chan;
+	}
+	return 0;
+};
 
 // receives status change notifications about wireless - could be useful
 // ctxt is pointer to a rw_evt_type
diff --git a/src/hal/bl602/hal_wifi_bl602.c b/src/hal/bl602/hal_wifi_bl602.c
@@ -184,6 +184,37 @@ void HAL_WiFi_SetupStatusCallback(void (*cb)(int code)) {
     aos_register_event_filter(EV_WIFI, event_cb_wifi_event, NULL);
 }
 
+// Get WiFi Information (SSID / BSSID) - e.g. to display on status page 
+// use bl_wifi_sta_info_get(bl_wifi_ap_info_t* sta_info); or bl_wifi_ap_info_get(bl_wifi_ap_info_t* ap_info);
+//        ef_get_env_blob((const char *)WIFI_AP_PSM_INFO_CHANNEL, val_buf, val_len, NULL);
+//        ef_get_env_blob((const char *)WIFI_AP_PSM_INFO_BSSID, val_buf, val_len, NULL);
+//
+/*
+// ATM there is only one SSID, so need for this code
+char* HAL_GetWiFiSSID(char* ssid){
+	wifi_mgmr_sta_connect_ind_stat_info_t info;
+	memset(&info, 0, sizeof(info));
+	wifi_mgmr_sta_connect_ind_stat_get(&info);
+//	memcpy(ssid, info.ssid, sizeof(ssid));
+	strcpy(ssid, info.ssid);
+	return ssid;
+};
+*/
+char* HAL_GetWiFiBSSID(char* bssid){
+	wifi_mgmr_sta_connect_ind_stat_info_t info;
+	memset(&info, 0, sizeof(info));
+	wifi_mgmr_sta_connect_ind_stat_get(&info);
+//	memcpy(bssid, info.bssid, sizeof(bssid));
+	sprintf(bssid, MACSTR, MAC2STR(info.bssid));
+	return bssid;
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	wifi_mgmr_sta_connect_ind_stat_info_t info;
+	memset(&info, 0, sizeof(info));
+	wifi_mgmr_sta_connect_ind_stat_get(&info);
+	*chan = info.chan_band;
+	return *chan;
+};
 
 void HAL_PrintNetworkInfo() {
 
diff --git a/src/hal/ecr6600/hal_wifi_ecr6600.c b/src/hal/ecr6600/hal_wifi_ecr6600.c
@@ -90,6 +90,28 @@ int HAL_GetWifiStrength()
 	return ap_info.rssi;
 }
 
+
+char* HAL_GetWiFiBSSID(char* bssid){
+	if (wifi_get_sta_status()==STA_STATUS_CONNECTED){
+		wifi_info_t ap_info;
+		memset((void*)&ap_info, 0, sizeof(wifi_info_t));
+		wifi_get_wifi_info(&ap_info);
+		sprintf(bssid, MACSTR, MAC2STR(ap_info.bssid));
+		return bssid;
+	}
+	bssid[0]='\0';
+	return bssid; 
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	if (wifi_get_sta_status()==STA_STATUS_CONNECTED){
+		*chan = wifi_rf_get_channel();
+		return *chan;
+	}
+	return 0;
+};
+
+
+
 static sys_err_t handle_wifi_event(void* ctx, system_event_t* event)
 {
 	switch(event->event_id)
diff --git a/src/hal/espidf/hal_wifi_espidf.c b/src/hal/espidf/hal_wifi_espidf.c
@@ -109,6 +109,27 @@ int HAL_GetWifiStrength()
 	return ap.rssi;
 }
 
+char* HAL_GetWiFiBSSID(char* bssid){
+	wifi_ap_record_t ap_info;
+	memset((void*)&ap_info, 0, sizeof(wifi_ap_record_t));
+	if (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK){	
+		sprintf(bssid, MACSTR, MAC2STR(ap_info.bssid));
+		return bssid;
+	}
+	bssid[0]='\0';
+	return bssid; 
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	wifi_ap_record_t ap_info;
+	memset((void*)&ap_info, 0, sizeof(wifi_ap_record_t));
+	if (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK){
+		*chan = ap_info.primary;
+		return *chan;
+	}
+	return 0;
+};
+
+
 void HAL_WiFi_SetupStatusCallback(void (*cb)(int code))
 {
 	g_wifiStatusCallback = cb;
diff --git a/src/hal/generic/hal_wifi_generic.c b/src/hal/generic/hal_wifi_generic.c
@@ -32,7 +32,14 @@ void __attribute__((weak)) WiFI_GetMacAddress(char* mac)
 {
 
 }
-
+char* __attribute__((weak)) HAL_GetWiFiBSSID(char* bssid) {
+	strcpy(bssid, "30:B5:C2:5D:70:72");
+	return bssid;
+};
+uint8_t __attribute__((weak)) HAL_GetWiFiChannel(uint8_t *chan) {
+	*chan = 12;
+	return *chan;
+};
 const char* __attribute__((weak)) HAL_GetMACStr(char* macstr)
 {
 	return "error";
diff --git a/src/hal/hal_wifi.h b/src/hal/hal_wifi.h
@@ -47,9 +47,18 @@ const char* HAL_GetMyGatewayString();
 const char* HAL_GetMyDNSString();
 const char* HAL_GetMyMaskString();
 const char* HAL_GetMACStr(char* macstr);
+
+// Get WiFi Information (SSID / BSSID) - e.g. to display on status page 
+// ATM there is only one SSID, so need for this code
+//char* HAL_GetWiFiSSID(char* ssid);
+
+char* HAL_GetWiFiBSSID(char* bssid);
+typedef unsigned char uint8_t ;
+uint8_t HAL_GetWiFiChannel(uint8_t *chan);
+
 void WiFI_GetMacAddress(char* mac);
 int WiFI_SetMacAddress(char* mac);
 void HAL_PrintNetworkInfo();
 int HAL_GetWifiStrength();
 
-#endif
+#endif
diff --git a/src/hal/ln882h/hal_wifi_ln882h.c b/src/hal/ln882h/hal_wifi_ln882h.c
@@ -138,6 +138,41 @@ int HAL_GetWifiStrength()
     wifi_sta_get_rssi(&val);
     return val;
 }
+// Get WiFi Information (SSID / BSSID) - e.g. to display on status page 
+/*
+const uint8_t * bssid;
+const char ssid[33]={0};
+
+if (wifi_get_sta_conn_info(&ssid, &bssid) == 0){
++			hprintf255(request, " --- Wifi SSID/BSSI: %s / [%02X:%02X:%02X:%02X:%02X:%02X] ", ssid, bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
++		}
+
+*/
+/*
+// ATM there is only one SSID, so need for this code
+
+char* HAL_GetWiFiSSID(char* ssid){
+	const uint8_t * bssid = NULL;
+	const char * tempssid = NULL;
+	wifi_get_sta_conn_info(&tempssid, &bssid);
+	strcpy(ssid,tempssid);
+	return ssid;
+};
+*/
+char* HAL_GetWiFiBSSID(char* bssid){
+	const uint8_t * tempbssid = NULL;
+	const char * ssid = NULL;
+	if (wifi_get_sta_conn_info(&ssid, &tempbssid) == 0) sprintf(bssid, MACSTR, MAC2STR(tempbssid));
+	return bssid;
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	wifi_scan_cfg_t   scan_cfg   = {0,};
+	wifi_get_sta_scan_cfg(&scan_cfg);
+	*chan = scan_cfg.channel;
+	return *chan;
+};
+
+
 
 void HAL_WiFi_SetupStatusCallback(void (*cb)(int code))
 {
@@ -198,7 +233,7 @@ void wifi_init_sta(const char* oob_ssid, const char* connect_key, obkStaticIP_t
 		.bssid   = NULL,
 		.psk_value = NULL,
 	};
-	
+//	wifi_manager_set_ap_list_sort_rule(1);
 	wifi_scan_cfg_t scan_cfg = {
         .channel   = 0,
         .scan_type = WIFI_SCAN_TYPE_ACTIVE,
diff --git a/src/hal/realtek/hal_wifi_realtek.c b/src/hal/realtek/hal_wifi_realtek.c
@@ -123,6 +123,17 @@ int HAL_GetWifiStrength()
 	return rssi;
 }
 
+char* HAL_GetWiFiBSSID(char* bssid){
+	uint8_t mac[6];
+	wext_get_bssid(WLAN0_NAME, mac);
+	sprintf(bssid, MACSTR, MAC2STR(mac));
+	return bssid; 
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	wext_get_channel(WLAN0_NAME, chan);
+	return *chan;
+};
+
 void HAL_WiFi_SetupStatusCallback(void (*cb)(int code))
 {
 	g_wifiStatusCallback = cb;
diff --git a/src/hal/tr6260/hal_wifi_tr6260.c b/src/hal/tr6260/hal_wifi_tr6260.c
@@ -79,6 +79,27 @@ int HAL_GetWifiStrength()
 	return ap_info.rssi;
 }
 
+char* HAL_GetWiFiBSSID(char* bssid){
+	wifi_info_t ap_info;
+	memset((void*)&ap_info, 0, sizeof(wifi_info_t));
+	if (wifi_get_wifi_info(&ap_info) == SYS_OK){	
+		sprintf(bssid, MACSTR, MAC2STR(ap_info.bssid));
+		return bssid;
+	}
+	bssid[0]='\0';
+	return bssid; 
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	wifi_info_t ap_info;
+	memset((void*)&ap_info, 0, sizeof(wifi_info_t));
+	if (wifi_get_wifi_info(&ap_info) == SYS_OK){
+		*chan = ap_info.channel;
+		return *chan;
+	}
+	return 0;
+};
+
+
 static sys_err_t handle_wifi_event(void* ctx, system_event_t* event)
 {
 	int vif;
diff --git a/src/hal/w800/hal_wifi_w800.c b/src/hal/w800/hal_wifi_w800.c
@@ -122,6 +122,31 @@ int HAL_GetWifiStrength()
 	return (signed char)(0x100-bss.rssi); //this is adjusted according to example
 }
 
+// Get WiFi Information (SSID / BSSID) - e.g. to display on status page 
+/*
+// ATM there is only one SSID, so need for this code
+
+char* HAL_GetWiFiSSID(char* ssid){
+	struct tls_curr_bss_t bss;
+	tls_wifi_get_current_bss(&bss);
+	strcpy(ssid,bss.ssid);
+	ssid[bss.ssid_len]='\0';
+	return ssid;
+};
+*/
+char* HAL_GetWiFiBSSID(char* bssid){
+	struct tls_curr_bss_t bss;
+	tls_wifi_get_current_bss(&bss);
+	sprintf(bssid, MACSTR, MAC2STR(bss.bssid));
+	return bssid;
+};
+uint8_t HAL_GetWiFiChannel(uint8_t *chan){
+	struct tls_curr_bss_t bss;
+	tls_wifi_get_current_bss(&bss);
+	*chan = bss.channel;
+	return *chan;
+};
+
 static void apsta_net_status(u8 status)
 {
 	switch (status)
diff --git a/src/hal/xradio/hal_wifi_xradio.c b/src/hal/xradio/hal_wifi_xradio.c
diff --git a/src/httpserver/json_interface.c b/src/httpserver/json_interface.c
diff --git a/src/new_common.h b/src/new_common.h
diff --git a/src/user_main.c b/src/user_main.c

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,14 @@ void __attribute__((weak)) WiFI_GetMacAddress(char* mac)`
`32`	`32`	`{`
`33`	`33`
`34`	`34`	`}`
`35`		`-`
	`35`	`+char* __attribute__((weak)) HAL_GetWiFiBSSID(char* bssid) {`
	`36`	`+ strcpy(bssid, "30:B5:C2:5D:70:72");`
	`37`	`+ return bssid;`
	`38`	`+};`
	`39`	`+uint8_t __attribute__((weak)) HAL_GetWiFiChannel(uint8_t *chan) {`
	`40`	`+ *chan = 12;`
	`41`	`+ return *chan;`
	`42`	`+};`
`36`	`43`	`const char* __attribute__((weak)) HAL_GetMACStr(char* macstr)`
`37`	`44`	`{`
`38`	`45`	`return "error";`