espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_wifi): Fix issue of station disconnecting immediately when AP RSSI is zero

Browse Source
This commit is contained in:
Sarvesh Bodakhe
2023-10-27 09:29:58 +05:30
committed by alanmaxwell
parent 20a34298cf
commit c90353291c
8 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_wifi/include/esp_wifi.h
View File

@ -1182,7 +1182,8 @@ esp_err_t esp_wifi_statis_dump(uint32_t modules);
* @attention If the user wants to receive another WIFI_EVENT_STA_BSS_RSSI_LOW event after receiving one, this API needs to be * @attention If the user wants to receive another WIFI_EVENT_STA_BSS_RSSI_LOW event after receiving one, this API needs to be
* called again with an updated/same RSSI threshold. * called again with an updated/same RSSI threshold.
* *
* @param rssi threshold value in dbm between -100 to 0 * @param rssi threshold value in dbm between -100 to 10
* Note that in some rare cases where signal strength is very strong, rssi values can be slightly positive.
* *
* @return * @return
* - ESP_OK: succeed * - ESP_OK: succeed

2
components/esp_wifi/include/esp_wifi_types.h
View File

@ -194,7 +194,7 @@ typedef struct {
uint8_t ssid[33]; /**< SSID of AP */ uint8_t ssid[33]; /**< SSID of AP */
uint8_t primary; /**< channel of AP */ uint8_t primary; /**< channel of AP */
wifi_second_chan_t second; /**< secondary channel of AP */ wifi_second_chan_t second; /**< secondary channel of AP */
int8_t rssi; /**< signal strength of AP */ int8_t rssi; /**< signal strength of AP. Note that in some rare cases where signal strength is very strong, rssi values can be slightly positive */
wifi_auth_mode_t authmode; /**< authmode of AP */ wifi_auth_mode_t authmode; /**< authmode of AP */
wifi_cipher_type_t pairwise_cipher; /**< pairwise cipher of AP */ wifi_cipher_type_t pairwise_cipher; /**< pairwise cipher of AP */
wifi_cipher_type_t group_cipher; /**< group cipher of AP */ wifi_cipher_type_t group_cipher; /**< group cipher of AP */

12
components/wpa_supplicant/esp_supplicant/src/esp_common.c
View File

@ -36,7 +36,7 @@ static bool s_supplicant_task_init_done;
#define SUPPLICANT_TASK_STACK_SIZE (6144 + TASK_STACK_SIZE_ADD) #define SUPPLICANT_TASK_STACK_SIZE (6144 + TASK_STACK_SIZE_ADD)
static int handle_action_frm(u8 *frame, size_t len, static int handle_action_frm(u8 *frame, size_t len,
u8 *sender, u32 rssi, u8 channel) u8 *sender, int8_t rssi, u8 channel)
{ {
struct ieee_mgmt_frame *frm = os_malloc(sizeof(struct ieee_mgmt_frame) + len); struct ieee_mgmt_frame *frm = os_malloc(sizeof(struct ieee_mgmt_frame) + len);
@ -62,7 +62,7 @@ static int handle_action_frm(u8 *frame, size_t len,
#if defined(CONFIG_WPA_11KV_SUPPORT) #if defined(CONFIG_WPA_11KV_SUPPORT)
static void handle_rrm_frame(struct wpa_supplicant *wpa_s, u8 *sender, static void handle_rrm_frame(struct wpa_supplicant *wpa_s, u8 *sender,
u8 *payload, size_t len, u32 rssi) u8 *payload, size_t len, int8_t rssi)
{ {
if (payload[0] == WLAN_RRM_NEIGHBOR_REPORT_RESPONSE) { if (payload[0] == WLAN_RRM_NEIGHBOR_REPORT_RESPONSE) {
/* neighbor report parsing */ /* neighbor report parsing */
@ -78,7 +78,7 @@ static void handle_rrm_frame(struct wpa_supplicant *wpa_s, u8 *sender,
} }
} }
static int mgmt_rx_action(u8 *frame, size_t len, u8 *sender, u32 rssi, u8 channel) static int mgmt_rx_action(u8 *frame, size_t len, u8 *sender, int8_t rssi, u8 channel)
{ {
u8 category; u8 category;
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
@ -204,7 +204,7 @@ static void register_mgmt_frames(struct wpa_supplicant *wpa_s)
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
static int handle_auth_frame(u8 *frame, size_t len, static int handle_auth_frame(u8 *frame, size_t len,
u8 *sender, u32 rssi, u8 channel) u8 *sender, int8_t rssi, u8 channel)
{ {
if (gWpaSm.key_mgmt == WPA_KEY_MGMT_FT_PSK) { if (gWpaSm.key_mgmt == WPA_KEY_MGMT_FT_PSK) {
if (gWpaSm.ft_protocol) { if (gWpaSm.ft_protocol) {
@ -219,7 +219,7 @@ static int handle_auth_frame(u8 *frame, size_t len,
} }
static int handle_assoc_frame(u8 *frame, size_t len, static int handle_assoc_frame(u8 *frame, size_t len,
u8 *sender, u32 rssi, u8 channel) u8 *sender, int8_t rssi, u8 channel)
{ {
if (gWpaSm.key_mgmt == WPA_KEY_MGMT_FT_PSK) { if (gWpaSm.key_mgmt == WPA_KEY_MGMT_FT_PSK) {
if (gWpaSm.ft_protocol) { if (gWpaSm.ft_protocol) {
@ -244,7 +244,7 @@ void esp_supplicant_unset_all_appie(void)
} }
static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender, static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
u32 rssi, u8 channel, u64 current_tsf) int8_t rssi, u8 channel, u64 current_tsf)
{ {
int ret = 0; int ret = 0;

4
components/wpa_supplicant/esp_supplicant/src/esp_common_i.h
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -16,7 +16,7 @@ extern struct wpa_supplicant g_wpa_supp;
struct ieee_mgmt_frame { struct ieee_mgmt_frame {
u8 sender[ETH_ALEN]; u8 sender[ETH_ALEN];
u8 channel; u8 channel;
u32 rssi; int8_t rssi;
size_t len; size_t len;
u8 payload[0]; u8 payload[0];
}; };

4
components/wpa_supplicant/esp_supplicant/src/esp_scan.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -114,7 +114,7 @@ void esp_scan_deinit(struct wpa_supplicant *wpa_s)
} }
int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender, int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender,
u32 rssi, u8 channel, u64 current_tsf) int8_t rssi, u8 channel, u64 current_tsf)
{ {
struct wpa_supplicant *wpa_s = &g_wpa_supp; struct wpa_supplicant *wpa_s = &g_wpa_supp;
struct os_reltime now; struct os_reltime now;

18
components/wpa_supplicant/esp_supplicant/src/esp_scan_i.h
View File

@ -1,17 +1,7 @@
/** /*
* Copyright 2020 Espressif Systems (Shanghai) PTE LTD * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * SPDX-License-Identifier: Apache-2.0
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
#ifndef ESP_SCAN_I_H #ifndef ESP_SCAN_I_H
@ -19,7 +9,7 @@
void esp_scan_init(struct wpa_supplicant *wpa_s); void esp_scan_init(struct wpa_supplicant *wpa_s);
void esp_scan_deinit(struct wpa_supplicant *wpa_s); void esp_scan_deinit(struct wpa_supplicant *wpa_s);
int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender, int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender,
u32 rssi, u8 channel, u64 current_tsf); int8_t rssi, u8 channel, u64 current_tsf);
void esp_supplicant_handle_scan_done_evt(void); void esp_supplicant_handle_scan_done_evt(void);
#endif #endif

2
components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h
View File

@ -135,7 +135,7 @@ struct wpa_funcs {
int (*wpa_michael_mic_failure)(u16 is_unicast); int (*wpa_michael_mic_failure)(u16 is_unicast);
uint8_t *(*wpa3_build_sae_msg)(uint8_t *bssid, uint32_t type, size_t *len); uint8_t *(*wpa3_build_sae_msg)(uint8_t *bssid, uint32_t type, size_t *len);
int (*wpa3_parse_sae_msg)(uint8_t *buf, size_t len, uint32_t type, uint16_t status); int (*wpa3_parse_sae_msg)(uint8_t *buf, size_t len, uint32_t type, uint16_t status);
int (*wpa_sta_rx_mgmt)(u8 type, u8 *frame, size_t len, u8 *sender, u32 rssi, u8 channel, u64 current_tsf); int (*wpa_sta_rx_mgmt)(u8 type, u8 *frame, size_t len, u8 *sender, int8_t rssi, u8 channel, u64 current_tsf);
void (*wpa_config_done)(void); void (*wpa_config_done)(void);
uint8_t *(*owe_build_dhie)(uint16_t group); uint8_t *(*owe_build_dhie)(uint16_t group);
int (*owe_process_assoc_resp)(const u8 *rsn_ie, size_t rsn_len, const uint8_t *dh_ie, size_t dh_len); int (*owe_process_assoc_resp)(const u8 *rsn_ie, size_t rsn_len, const uint8_t *dh_ie, size_t dh_len);

1
tools/ci/check_copyright_ignore.txt
View File

@ -1244,7 +1244,6 @@ components/wifi_provisioning/src/scheme_console.c
components/wifi_provisioning/src/wifi_config.c components/wifi_provisioning/src/wifi_config.c
components/wifi_provisioning/src/wifi_provisioning_priv.h components/wifi_provisioning/src/wifi_provisioning_priv.h
components/wifi_provisioning/src/wifi_scan.c components/wifi_provisioning/src/wifi_scan.c
components/wpa_supplicant/esp_supplicant/src/esp_scan_i.h
components/wpa_supplicant/esp_supplicant/src/esp_wpa3_i.h components/wpa_supplicant/esp_supplicant/src/esp_wpa3_i.h
components/wpa_supplicant/esp_supplicant/src/esp_wpa_err.h components/wpa_supplicant/esp_supplicant/src/esp_wpa_err.h
components/wpa_supplicant/include/utils/wpa_debug.h components/wpa_supplicant/include/utils/wpa_debug.h