Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

Merge pull request #3507 from TD-er/bugfix/WiFi_AP_candidate_RTC

Browse Source 
[WiFi] Fix WiFi AP candidate from RTC causing crash
This commit is contained in:
TD-er
2021-02-11 22:38:18 +01:00
committed by GitHub
parent 09690f1873 e6f786c02e
commit 97b9128da9
2 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/src/ESPEasyCore/Controller.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ String getLWT_topic(const ControllerSettingsStruct& ControllerSettings) {
LWTTopic = ControllerSettings.Subscribe;
LWTTopic += F("/LWT");
}
LWTTopic.replace(F("/#"), F("/status"));
LWTTopic.replace(String(F("/#")), String(F("/status")));
parseSystemVariables(LWTTopic, false);
}
return LWTTopic;
src/src/Helpers/WiFi_AP_CandidatesList.cpp
+16 -37
View File
@@ -176,48 +176,27 @@ void WiFi_AP_CandidatesList::addFromRTC() {
return;
}
bool matchfound = false;
bool mustAdd = false;
int32_t channel = 0;
byte enc_type = 0;
{
WiFi_AP_Candidate tmp(RTC.lastWiFiSettingsIndex, ssid, key);
candidates.emplace_front(RTC.lastWiFiSettingsIndex, ssid, key);
candidates.front().setBSSID(RTC.lastBSSID);
candidates.front().rssi = -1; // Set to best possible RSSI so it is tried first.
candidates.front().channel = RTC.lastWiFiChannel;
tmp.setBSSID(RTC.lastBSSID);
if (!tmp.bssid_set()) return;
// This is not taken from a scan, so no idea of the used encryption.
// Try to find a matching BSSID to get the encryption.
for (auto it = candidates.begin(); !matchfound && it != candidates.end(); ++it) {
if (tmp == *it) {
matchfound = true;
channel = it->channel;
enc_type = it->enc_type;
}
}
if (!matchfound) {
if (currentCandidate == tmp) {
matchfound = true;
channel = currentCandidate.channel;
enc_type = currentCandidate.enc_type;
}
}
if (tmp.usable() && tmp.allowQuickConnect()) {
mustAdd = true;
}
if (!candidates.front().usable() || !candidates.front().allowQuickConnect()) {
candidates.pop_front();
return;
}
if (mustAdd) {
// TD-er: Recreate the object here. Otherwise removal of the RTC added candidate causes crashes.
candidates.emplace_front(RTC.lastWiFiSettingsIndex, ssid, key);
candidates.front().setBSSID(RTC.lastBSSID);
candidates.front().channel = RTC.lastWiFiChannel;
candidates.front().rssi = -1; // Set to best possible RSSI so it is tried first.
if (matchfound) {
candidates.front().enc_type = enc_type;
candidates.front().channel = channel;
// This is not taken from a scan, so no idea of the used encryption.
// Try to find a matching BSSID to get the encryption.
for (auto it = candidates.begin(); it != candidates.end(); ++it) {
if ((it->rssi != -1) && candidates.front() == *it) {
candidates.front().enc_type = it->enc_type;
return;
}
}
if (currentCandidate == candidates.front()) {
candidates.front().enc_type = currentCandidate.enc_type;
}
}
void WiFi_AP_CandidatesList::purge_unusable() {