fix(esp_wifi): Add some bugfixes and cleanup in softAP

sarveshb14 · jack0c · commit fdb4197d02a7 · 2024-05-20T11:50:09.000+08:00
1. Fix wrong reason code in 'WIFI_EVENT_AP_STADISCONNECTED' event
2. cleanup in softAP for disconnecting connected station
3. Update examples to display reason while processing WIFI_EVENT_AP_STADISCONNECTED event
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1849,7 +1849,7 @@ ieee80211_alloc_tx_buf = 0x40002108;
 /* ieee80211_send_nulldata = 0x40002110; */
 /* ieee80211_setup_robust_mgmtframe = 0x40002114; */
 ieee80211_encap_null_data = 0x4000211c;
-ieee80211_send_deauth = 0x40002120;
+ieee80211_send_deauth_no_bss = 0x40002120;
 ieee80211_alloc_deauth = 0x40002124;
 ieee80211_send_proberesp = 0x40002128;
 ieee80211_getcapinfo = 0x40002130;
diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h
@@ -903,7 +903,7 @@ typedef struct {
     uint8_t mac[6];           /**< MAC address of the station disconnects to soft-AP */
     uint8_t aid;              /**< the aid that soft-AP gave to the station disconnects to  */
     bool is_mesh_child;       /**< flag to identify mesh child */
-    uint8_t reason;           /**< reason of disconnection */
+    uint16_t reason;           /**< reason of disconnection */
 } wifi_event_ap_stadisconnected_t;
 
 /** Argument structure for WIFI_EVENT_AP_PROBEREQRECVED event */
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 321823002fd7aa2d76b9996b95336495011525db
+Subproject commit 482ab97ae352dfdbaed028338a9ee45d7f2e6127
diff --git a/examples/bluetooth/blufi/main/blufi_example_main.c b/examples/bluetooth/blufi/main/blufi_example_main.c
@@ -246,7 +246,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
     }
     case WIFI_EVENT_AP_STADISCONNECTED: {
         wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
-        BLUFI_INFO("station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid);
+        BLUFI_INFO("station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);
         break;
     }
 
diff --git a/examples/protocols/http_server/captive_portal/main/main.c b/examples/protocols/http_server/captive_portal/main/main.c
@@ -39,8 +39,8 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
                  MAC2STR(event->mac), event->aid);
     } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
         wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *)event_data;
-        ESP_LOGI(TAG, "station " MACSTR " leave, AID=%d",
-                 MAC2STR(event->mac), event->aid);
+        ESP_LOGI(TAG, "station " MACSTR " leave, AID=%d, reason=%d",
+                 MAC2STR(event->mac), event->aid, event->reason);
     }
 }
 
diff --git a/examples/wifi/getting_started/softAP/main/softap_example_main.c b/examples/wifi/getting_started/softAP/main/softap_example_main.c
@@ -39,8 +39,8 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
                  MAC2STR(event->mac), event->aid);
     } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
         wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
-        ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d",
-                 MAC2STR(event->mac), event->aid);
+        ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d",
+                 MAC2STR(event->mac), event->aid, event->reason);
     }
 }
 
diff --git a/examples/wifi/softap_sta/main/softap_sta.c b/examples/wifi/softap_sta/main/softap_sta.c
@@ -90,8 +90,8 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
                  MAC2STR(event->mac), event->aid);
     } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_AP_STADISCONNECTED) {
         wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *) event_data;
-        ESP_LOGI(TAG_AP, "Station "MACSTR" left, AID=%d",
-                 MAC2STR(event->mac), event->aid);
+        ESP_LOGI(TAG_AP, "Station "MACSTR" left, AID=%d, reason:%d",
+                 MAC2STR(event->mac), event->aid, event->reason);
     } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
         esp_wifi_connect();
         ESP_LOGI(TAG_STA, "Station started");
@@ -145,7 +145,7 @@ esp_netif_t *wifi_init_sta(void)
             .password = EXAMPLE_ESP_WIFI_STA_PASSWD,
             .scan_method = WIFI_ALL_CHANNEL_SCAN,
             .failure_retry_cnt = EXAMPLE_ESP_MAXIMUM_RETRY,
-            /* Authmode threshold resets to WPA2 as default if password matches WPA2 standards (pasword len => 8).
+            /* Authmode threshold resets to WPA2 as default if password matches WPA2 standards (password len => 8).
              * If you want to connect the device to deprecated WEP/WPA networks, Please set the threshold value
              * to WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK and set the password with length and format matching to
             * WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK standards.
diff --git a/examples/wifi/wps_softap_registrar/main/wps.c b/examples/wifi/wps_softap_registrar/main/wps.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -62,8 +62,8 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
 		{
 			ESP_LOGI(TAG, "WIFI_EVENT_AP_STADISCONNECTED");
 			wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
-			ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d",
-					MAC2STR(event->mac), event->aid);
+			ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d",
+					MAC2STR(event->mac), event->aid, event->reason);
 		}
 		break;
 	case WIFI_EVENT_AP_STACONNECTED:
diff --git a/tools/test_apps/peripherals/i2c_wifi/main/i2c_wifi_main.c b/tools/test_apps/peripherals/i2c_wifi/main/i2c_wifi_main.c
@@ -56,7 +56,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
         ESP_LOGI(TAG, "station "MACSTR" join, AID=%d", MAC2STR(event->mac), event->aid);
     } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
         wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *) event_data;
-        ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid);
+        ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,`
`246`	`246`	`}`
`247`	`247`	`case WIFI_EVENT_AP_STADISCONNECTED: {`
`248`	`248`	`wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;`
`249`		`- BLUFI_INFO("station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid);`
	`249`	`+ BLUFI_INFO("station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);`
`250`	`250`	`break;`
`251`	`251`	`}`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,`
`39`	`39`	`MAC2STR(event->mac), event->aid);`
`40`	`40`	`} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {`
`41`	`41`	`wifi_event_ap_stadisconnected_t event = (wifi_event_ap_stadisconnected_t )event_data;`
`42`		`- ESP_LOGI(TAG, "station " MACSTR " leave, AID=%d",`
`43`		`- MAC2STR(event->mac), event->aid);`
	`42`	`+ ESP_LOGI(TAG, "station " MACSTR " leave, AID=%d, reason=%d",`
	`43`	`+ MAC2STR(event->mac), event->aid, event->reason);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD`
	`2`	`+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Unlicense OR CC0-1.0`
`5`	`5`	`*/`
`@@ -62,8 +62,8 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,`
`62`	`62`	`{`
`63`	`63`	`ESP_LOGI(TAG, "WIFI_EVENT_AP_STADISCONNECTED");`
`64`	`64`	`wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;`
`65`		`- ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d",`
`66`		`- MAC2STR(event->mac), event->aid);`
	`65`	`+ ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d",`
	`66`	`+ MAC2STR(event->mac), event->aid, event->reason);`
`67`	`67`	`}`
`68`	`68`	`break;`
`69`	`69`	`case WIFI_EVENT_AP_STACONNECTED:`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,`
`56`	`56`	`ESP_LOGI(TAG, "station "MACSTR" join, AID=%d", MAC2STR(event->mac), event->aid);`
`57`	`57`	`} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {`
`58`	`58`	`wifi_event_ap_stadisconnected_t event = (wifi_event_ap_stadisconnected_t ) event_data;`
`59`		`- ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid);`
	`59`	`+ ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`