scratch/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

[wifi] Avoid unnecessary string copy in failed connection logging (#12659)

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-26 08:44:03 -10:00
committed by GitHub
parent 963f594c9e
commit 0919017d49
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1523,12 +1523,12 @@ void WiFiComponent::log_and_adjust_priority_for_failed_connect_() {
return; // No BSSID to penalize return; // No BSSID to penalize
} }
// Get SSID for logging // Get SSID for logging (use pointer to avoid copy)
std::string ssid; const std::string *ssid = nullptr;
if (this->retry_phase_ == WiFiRetryPhase::SCAN_CONNECTING && !this->scan_result_.empty()) { if (this->retry_phase_ == WiFiRetryPhase::SCAN_CONNECTING && !this->scan_result_.empty()) {
ssid = this->scan_result_[0].get_ssid(); ssid = &this->scan_result_[0].get_ssid();
} else if (const WiFiAP *config = this->get_selected_sta_()) { } else if (const WiFiAP *config = this->get_selected_sta_()) {
ssid = config->get_ssid(); ssid = &config->get_ssid();
} }
// Only decrease priority on the last attempt for this phase // Only decrease priority on the last attempt for this phase
@@ -1548,8 +1548,8 @@ void WiFiComponent::log_and_adjust_priority_for_failed_connect_() {
} }
char bssid_s[18]; char bssid_s[18];
format_mac_addr_upper(failed_bssid.value().data(), bssid_s); format_mac_addr_upper(failed_bssid.value().data(), bssid_s);
ESP_LOGD(TAG, "Failed " LOG_SECRET("'%s'") " " LOG_SECRET("(%s)") ", priority %d → %d", ssid.c_str(), bssid_s, ESP_LOGD(TAG, "Failed " LOG_SECRET("'%s'") " " LOG_SECRET("(%s)") ", priority %d → %d",
old_priority, new_priority); ssid != nullptr ? ssid->c_str() : "", bssid_s, old_priority, new_priority);
// After adjusting priority, check if all priorities are now at minimum // After adjusting priority, check if all priorities are now at minimum
// If so, clear the vector to save memory and reset for fresh start // If so, clear the vector to save memory and reset for fresh start