espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-03 18:40:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(roaming_app): resolve issues in blacklisting logic

Browse Source 
This commit addresses several issues in the BSSID blacklisting
feature of the roaming application:

- Merged duplicate  functions into a single,
  unified function, resolving a compilation error.
- Corrected  and
  to properly access the  member of the
  struct, fixing invalid memory access.
- Introduced  in Kconfig to enable
  the manual blacklisting feature and made auto-blacklisting
  dependent on it.
- Updated  to use the
  correct BSSID from .
- Optimized the removal of expired blacklist entries by using
   for better efficiency.
This commit is contained in:
Kapil Gupta
2025-07-25 12:12:41 +05:30
committed by BOT
parent a7d2066913
commit 074b2d0f93
3 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_wifi/wifi_apps/roaming_app/src/Kconfig.roaming
View File

@@ -184,8 +184,15 @@ config ESP_WIFI_ROAMING_RRM_MONITOR_THRESHOLD
The RSSI threshold beyond which we start sending periodic neighbor report requests. The RSSI threshold beyond which we start sending periodic neighbor report requests.
menu "Blacklist Configuration" menu "Blacklist Configuration"
config ESP_WIFI_ROAMING_BSSID_BLACKLIST
bool "Enable BSSID blacklisting"
default n
help
Enable this to blacklist BSSIDs.
config ESP_WIFI_ROAMING_AUTO_BLACKLISTING config ESP_WIFI_ROAMING_AUTO_BLACKLISTING
bool "Enable automatic BSSID blacklisting" bool "Enable automatic BSSID blacklisting"
depends on ESP_WIFI_ROAMING_BSSID_BLACKLIST
default y default y
help help
Enable this to automatically blacklist BSSIDs after multiple failed connection attempts. Enable this to automatically blacklist BSSIDs after multiple failed connection attempts.
@@ -205,4 +212,11 @@ menu "Blacklist Configuration"
default 300 default 300
help help
Time in seconds for which a BSSID remains in the blacklist. Time in seconds for which a BSSID remains in the blacklist.
config ESP_WIFI_ROAMING_MAX_CANDIDATES
int "Maximum number of roaming candidates"
range 1 10
default 5
help
Maximum number of roaming candidates to consider. This also defines the size of the blacklist.
endmenu # "Blacklist Configuration" endmenu # "Blacklist Configuration"

3
components/esp_wifi/wifi_apps/roaming_app/src/esp_roaming_i.h
View File

@@ -140,8 +140,7 @@ struct roaming_app {
uint8_t bssid[ETH_ALEN]; uint8_t bssid[ETH_ALEN];
uint8_t failures; uint8_t failures;
struct timeval timestamp; struct timeval timestamp;
}; } bssid_blacklist[CONFIG_ESP_WIFI_ROAMING_MAX_CANDIDATES];
struct blacklist_entry bssid_blacklist[CONFIG_ESP_WIFI_ROAMING_MAX_CANDIDATES];
uint8_t bssid_blacklist_count; uint8_t bssid_blacklist_count;
#endif #endif
bool allow_reconnect; bool allow_reconnect;

48
components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c
View File

@@ -184,23 +184,23 @@ static void roaming_app_disconnected_event_handler(void *ctx, void *data)
if (disconn->reason == WIFI_REASON_CONNECTION_FAIL || disconn->reason == WIFI_REASON_AUTH_FAIL) { if (disconn->reason == WIFI_REASON_CONNECTION_FAIL || disconn->reason == WIFI_REASON_AUTH_FAIL) {
bool found = false; bool found = false;
for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) { for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) {
if (memcmp(g_roaming_app.bssid_blacklist[i].bssid, disconn->bssid, ETH_ALEN) == 0) { if (memcmp(g_roaming_app.bssid_blacklist[i].bssid, g_roaming_app.current_bss.ap.bssid, ETH_ALEN) == 0) {
g_roaming_app.bssid_blacklist[i].failures++; g_roaming_app.bssid_blacklist[i].failures++;
gettimeofday(&g_roaming_app.bssid_blacklist[i].timestamp, NULL); gettimeofday(&g_roaming_app.bssid_blacklist[i].timestamp, NULL);
ESP_LOGD(ROAMING_TAG, "BSSID " MACSTR " connection failures: %d", MAC2STR(disconn->bssid), g_roaming_app.bssid_blacklist[i].failures); ESP_LOGD(ROAMING_TAG, "BSSID " MACSTR " connection failures: %d", MAC2STR(g_roaming_app.current_bss.ap.bssid), g_roaming_app.bssid_blacklist[i].failures);
if (g_roaming_app.bssid_blacklist[i].failures >= CONFIG_ESP_WIFI_ROAMING_MAX_CONN_FAILURES) { if (g_roaming_app.bssid_blacklist[i].failures >= CONFIG_ESP_WIFI_ROAMING_MAX_CONN_FAILURES) {
ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " blacklisted", MAC2STR(disconn->bssid)); ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " blacklisted", MAC2STR(g_roaming_app.current_bss.ap.bssid));
} }
found = true; found = true;
break; break;
} }
} }
if (!found && g_roaming_app.bssid_blacklist_count < CONFIG_ESP_WIFI_ROAMING_MAX_CANDIDATES) { if (!found && g_roaming_app.bssid_blacklist_count < CONFIG_ESP_WIFI_ROAMING_MAX_CANDIDATES) {
memcpy(g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].bssid, disconn->bssid, ETH_ALEN); memcpy(g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].bssid, g_roaming_app.current_bss.ap.bssid, ETH_ALEN);
g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].failures = 1; g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].failures = 1;
gettimeofday(&g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].timestamp, NULL); gettimeofday(&g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].timestamp, NULL);
g_roaming_app.bssid_blacklist_count++; g_roaming_app.bssid_blacklist_count++;
ESP_LOGD(ROAMING_TAG, "BSSID " MACSTR " added to blacklist tracking", MAC2STR(disconn->bssid)); ESP_LOGD(ROAMING_TAG, "BSSID " MACSTR " added to blacklist tracking", MAC2STR(g_roaming_app.current_bss.ap.bssid));
} }
} }
#endif #endif
@@ -609,17 +609,6 @@ static bool candidate_profile_match(wifi_ap_record_t candidate)
{ {
return candidate_security_match(candidate); return candidate_security_match(candidate);
} }
#if CONFIG_ESP_WIFI_ROAMING_BSSID_BLACKLIST
static bool is_bssid_blacklisted(const uint8_t *bssid)
{
for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) {
if (memcmp(g_roaming_app.bssid_blacklist[i], bssid, ETH_ALEN) == 0) {
return true;
}
}
return false;
}
#endif
#if CONFIG_ESP_WIFI_ROAMING_AUTO_BLACKLISTING #if CONFIG_ESP_WIFI_ROAMING_AUTO_BLACKLISTING
static void remove_expired_blacklist_entries(void) static void remove_expired_blacklist_entries(void)
@@ -629,8 +618,9 @@ static void remove_expired_blacklist_entries(void)
for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) { for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) {
if (time_diff_sec(&now, &g_roaming_app.bssid_blacklist[i].timestamp) > CONFIG_ESP_WIFI_ROAMING_BLACKLIST_TIMEOUT) { if (time_diff_sec(&now, &g_roaming_app.bssid_blacklist[i].timestamp) > CONFIG_ESP_WIFI_ROAMING_BLACKLIST_TIMEOUT) {
ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " removed from blacklist due to timeout", MAC2STR(g_roaming_app.bssid_blacklist[i].bssid)); ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " removed from blacklist due to timeout", MAC2STR(g_roaming_app.bssid_blacklist[i].bssid));
for (int j = i; j < g_roaming_app.bssid_blacklist_count - 1; j++) { int remaining_entries = g_roaming_app.bssid_blacklist_count - i - 1;
g_roaming_app.bssid_blacklist[j] = g_roaming_app.bssid_blacklist[j + 1]; if (remaining_entries > 0) {
memmove(&g_roaming_app.bssid_blacklist[i], &g_roaming_app.bssid_blacklist[i + 1], remaining_entries * sizeof(struct blacklist_entry));
} }
g_roaming_app.bssid_blacklist_count--; g_roaming_app.bssid_blacklist_count--;
i--; // Decrement i to recheck the current index i--; // Decrement i to recheck the current index
@@ -649,6 +639,13 @@ static bool is_bssid_blacklisted(const uint8_t *bssid)
return true; return true;
} }
} }
#endif
#if CONFIG_ESP_WIFI_ROAMING_BSSID_BLACKLIST
for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) {
if (memcmp(g_roaming_app.bssid_blacklist[i].bssid, bssid, ETH_ALEN) == 0) {
return true;
}
}
#endif #endif
return false; return false;
} }
@@ -1025,17 +1022,19 @@ esp_err_t esp_wifi_blacklist_add(const uint8_t *bssid)
if (!bssid) { if (!bssid) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
if (g_roaming_app.bssid_blacklist_count >= CONFIG_ESP_WIFI_ROAMING_BSSID_BLACKLIST_COUNT) { if (g_roaming_app.bssid_blacklist_count >= CONFIG_ESP_WIFI_ROAMING_MAX_CANDIDATES) {
ESP_LOGE(ROAMING_TAG, "Blacklist is full"); ESP_LOGE(ROAMING_TAG, "Blacklist is full");
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) { for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) {
if (memcmp(g_roaming_app.bssid_blacklist[i], bssid, ETH_ALEN) == 0) { if (memcmp(g_roaming_app.bssid_blacklist[i].bssid, bssid, ETH_ALEN) == 0) {
ESP_LOGD(ROAMING_TAG, "BSSID " MACSTR " already in blacklist", MAC2STR(bssid)); ESP_LOGD(ROAMING_TAG, "BSSID " MACSTR " already in blacklist", MAC2STR(bssid));
return ESP_OK; // Already blacklisted return ESP_OK; // Already blacklisted
} }
} }
memcpy(g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count], bssid, ETH_ALEN); memcpy(g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].bssid, bssid, ETH_ALEN);
g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].failures = CONFIG_ESP_WIFI_ROAMING_MAX_CONN_FAILURES;
gettimeofday(&g_roaming_app.bssid_blacklist[g_roaming_app.bssid_blacklist_count].timestamp, NULL);
g_roaming_app.bssid_blacklist_count++; g_roaming_app.bssid_blacklist_count++;
ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " added to blacklist", MAC2STR(bssid)); ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " added to blacklist", MAC2STR(bssid));
return ESP_OK; return ESP_OK;
@@ -1048,7 +1047,7 @@ esp_err_t esp_wifi_blacklist_remove(const uint8_t *bssid)
} }
int found_index = -1; int found_index = -1;
for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) { for (int i = 0; i < g_roaming_app.bssid_blacklist_count; i++) {
if (memcmp(g_roaming_app.bssid_blacklist[i], bssid, ETH_ALEN) == 0) { if (memcmp(g_roaming_app.bssid_blacklist[i].bssid, bssid, ETH_ALEN) == 0) {
found_index = i; found_index = i;
break; break;
} }
@@ -1056,8 +1055,9 @@ esp_err_t esp_wifi_blacklist_remove(const uint8_t *bssid)
if (found_index != -1) { if (found_index != -1) {
// Shift elements to fill the gap // Shift elements to fill the gap
for (int i = found_index; i < g_roaming_app.bssid_blacklist_count - 1; i++) { int remaining_entries = g_roaming_app.bssid_blacklist_count - found_index - 1;
memcpy(g_roaming_app.bssid_blacklist[i], g_roaming_app.bssid_blacklist[i + 1], ETH_ALEN); if (remaining_entries > 0) {
memmove(&g_roaming_app.bssid_blacklist[found_index], &g_roaming_app.bssid_blacklist[found_index + 1], remaining_entries * sizeof(struct blacklist_entry));
} }
g_roaming_app.bssid_blacklist_count--; g_roaming_app.bssid_blacklist_count--;
ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " removed from blacklist", MAC2STR(bssid)); ESP_LOGI(ROAMING_TAG, "BSSID " MACSTR " removed from blacklist", MAC2STR(bssid));