sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 00:31:58 +00:00
Code Issues Releases Wiki Activity

Merge branch 'filter_wifi_scan_results' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-20 22:42:18 -10:00
parent ba67cd52b6 f6ec5e9c28
commit f441aa2f43
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/wifi/wifi_component.cpp
View File

@@ -427,6 +427,11 @@ bool WiFiComponent::matches_configured_network_(const char *ssid, const uint8_t
void WiFiComponent::log_discarded_scan_result(const char *ssid, const uint8_t *bssid, int8_t rssi, uint8_t channel) {
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
// Skip logging during roaming scans to avoid log buffer overflow
// (roaming scans typically find many networks but only care about same-SSID APs)
if (this->roaming_state_ == RoamingState::SCANNING) {
return;
}
char bssid_s[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
format_mac_addr_upper(bssid, bssid_s);
ESP_LOGV(TAG, "- " LOG_SECRET("'%s'") " " LOG_SECRET("(%s)") " %ddB Ch:%u", ssid, bssid_s, rssi, channel);

4
esphome/components/wifi/wifi_component.h
View File

@@ -547,8 +547,8 @@ class WiFiComponent : public Component {
/// Check if network matches any configured network (for scan result filtering)
/// Matches by SSID when configured, or by BSSID for BSSID-only configs
bool matches_configured_network_(const char *ssid, const uint8_t *bssid) const;
/// Log a discarded scan result at VERBOSE level
static void log_discarded_scan_result(const char *ssid, const uint8_t *bssid, int8_t rssi, uint8_t channel);
/// Log a discarded scan result at VERBOSE level (skipped during roaming scans to avoid log overflow)
void log_discarded_scan_result(const char *ssid, const uint8_t *bssid, int8_t rssi, uint8_t channel);
/// Find next SSID that wasn't in scan results (might be hidden)
/// Returns index of next potentially hidden SSID, or -1 if none found
/// @param start_index Start searching from index after this (-1 to start from beginning)

2
esphome/components/wifi/wifi_component_esp8266.cpp
View File

@@ -780,7 +780,7 @@ void WiFiComponent::wifi_scan_done_callback_(void *arg, STATUS status) {
bssid_t{it->bssid[0], it->bssid[1], it->bssid[2], it->bssid[3], it->bssid[4], it->bssid[5]},
std::string(ssid_cstr, it->ssid_len), it->channel, it->rssi, it->authmode != AUTH_OPEN, it->is_hidden != 0);
} else {
WiFiComponent::log_discarded_scan_result(ssid_cstr, it->bssid, it->rssi, it->channel);
this->log_discarded_scan_result(ssid_cstr, it->bssid, it->rssi, it->channel);
}
}
ESP_LOGV(TAG, "Scan complete: %zu found, %zu stored%s", total, this->scan_result_.size(),

2
esphome/components/wifi/wifi_component_esp_idf.cpp
View File

@@ -857,7 +857,7 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
this->scan_result_.emplace_back(bssid, std::move(ssid), record.primary, record.rssi,
record.authmode != WIFI_AUTH_OPEN, ssid_cstr[0] == '\0');
} else {
WiFiComponent::log_discarded_scan_result(ssid_cstr, record.bssid, record.rssi, record.primary);
this->log_discarded_scan_result(ssid_cstr, record.bssid, record.rssi, record.primary);
}
}
ESP_LOGV(TAG, "Scan complete: %u found, %zu stored%s", number, this->scan_result_.size(),

2
esphome/components/wifi/wifi_component_libretiny.cpp
View File

@@ -692,7 +692,7 @@ void WiFiComponent::wifi_scan_done_callback_() {
ssid_cstr[0] == '\0');
} else {
auto &ap = scan->ap[i];
WiFiComponent::log_discarded_scan_result(ssid_cstr, ap.bssid.addr, ap.rssi, ap.channel);
this->log_discarded_scan_result(ssid_cstr, ap.bssid.addr, ap.rssi, ap.channel);
}
}
ESP_LOGV(TAG, "Scan complete: %d found, %zu stored%s", num, this->scan_result_.size(),

2
esphome/components/wifi/wifi_component_pico_w.cpp
View File

@@ -143,7 +143,7 @@ void WiFiComponent::wifi_scan_result(void *env, const cyw43_ev_scan_result_t *re
// Skip networks that don't match any configured network (unless full results needed)
if (!this->needs_full_scan_results_() && !this->matches_configured_network_(ssid_cstr, result->bssid)) {
WiFiComponent::log_discarded_scan_result(ssid_cstr, result->bssid, result->rssi, result->channel);
this->log_discarded_scan_result(ssid_cstr, result->bssid, result->rssi, result->channel);
return;
}