feedc0de/espwifistack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Rebuild wifi sta connect plan when the user changes password during connect phase

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-03-02 05:57:56 +01:00
parent 3d36fa2b4c
commit 96c706c684
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/espwifistack.cpp
View File

@@ -131,6 +131,7 @@ espchrono::milliseconds32 scanTimeout = 10s;
std::optional<scan_result> _scanResult; std::optional<scan_result> _scanResult;
bool scanResultChangedFlag{}; bool scanResultChangedFlag{};
std::string _connectPlanWifisChecksum;
std::vector<mac_t> _pastConnectPlan; std::vector<mac_t> _pastConnectPlan;
mac_t _currentConnectPlanEntry; mac_t _currentConnectPlanEntry;
std::vector<mac_t> _connectPlan; std::vector<mac_t> _connectPlan;
@@ -569,11 +570,25 @@ void update(const config &config)
ESP_LOGI(TAG, "clearing connect fail flag"); ESP_LOGI(TAG, "clearing connect fail flag");
_wifiConnectFailFlag = std::nullopt; _wifiConnectFailFlag = std::nullopt;
if (_wifiConnectFailCounter++ >= 10) if (auto newConnectPlanWifisChecksum = calculateWifisChecksum(*config.sta);
_connectPlanWifisChecksum != newConnectPlanWifisChecksum)
{ {
ESP_LOGE(TAG, "fail flag was set and fail count exceeded limit"); ESP_LOGI(TAG, "wifi configs changed, building new connect plan...");
if (const auto result = wifi_sta_disconnect(config, true); result != ESP_OK) if (const auto result = wifi_sta_disconnect(config, true); result != ESP_OK)
ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result)); ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result));
setWifiState(WiFiState::None); // results in another scan
buildConnectPlan(config, *config.sta);
}
else if (_wifiConnectFailCounter++ >= 10)
{
ESP_LOGE(TAG, "fail flag was set and fail count exceeded limit");
if (const auto result = wifi_sta_disconnect(config, true); result != ESP_OK)
ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result));
setWifiState(WiFiState::None); // results in another scan setWifiState(WiFiState::None); // results in another scan
} }
else else
@@ -584,6 +599,7 @@ void update(const config &config)
if (const auto result = wifi_sta_disconnect(config); result != ESP_OK) if (const auto result = wifi_sta_disconnect(config); result != ESP_OK)
ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result)); ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result));
if (const auto result = wifi_sta_restart(config); result != ESP_OK) if (const auto result = wifi_sta_restart(config); result != ESP_OK)
ESP_LOGE(TAG, "wifi_sta_restart() failed with %s", esp_err_to_name(result)); ESP_LOGE(TAG, "wifi_sta_restart() failed with %s", esp_err_to_name(result));
} }
@@ -595,8 +611,10 @@ void update(const config &config)
if (_wifiConnectFailCounter++ >= 10) if (_wifiConnectFailCounter++ >= 10)
{ {
ESP_LOGE(TAG, "connecting timed out, fail flag was set and fail count exceeded limit"); ESP_LOGE(TAG, "connecting timed out, fail flag was set and fail count exceeded limit");
if (const auto result = wifi_sta_disconnect(config, true); result != ESP_OK) if (const auto result = wifi_sta_disconnect(config, true); result != ESP_OK)
ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result)); ESP_LOGE(TAG, "wifi_sta_disconnect() failed with %s", esp_err_to_name(result));
setWifiState(WiFiState::None); // results in another scan setWifiState(WiFiState::None); // results in another scan
} }
else else
@@ -2501,6 +2519,8 @@ bool buildConnectPlan(const config &config, const sta_config &sta_config)
bool buildConnectPlan(const config &config, const sta_config &sta_config, const scan_result &scanResult) bool buildConnectPlan(const config &config, const sta_config &sta_config, const scan_result &scanResult)
{ {
_connectPlanWifisChecksum = calculateWifisChecksum(sta_config);
_pastConnectPlan.clear(); _pastConnectPlan.clear();
_currentConnectPlanEntry = mac_t{}; _currentConnectPlanEntry = mac_t{};
_connectPlan.clear(); _connectPlan.clear();
@@ -2581,17 +2601,19 @@ bool nextConnectPlanItem(const config &config, const sta_config &sta_config, con
return nextConnectPlanItem(config, sta_config, scanResult); return nextConnectPlanItem(config, sta_config, scanResult);
} }
const std::string_view ssid{reinterpret_cast<const char *>(scanResultIter->ssid)};
const auto configIter = std::find_if(std::begin(sta_config.wifis), std::end(sta_config.wifis), const auto configIter = std::find_if(std::begin(sta_config.wifis), std::end(sta_config.wifis),
[ssid=scanResultIter->ssid](const wifi_entry &entry){ return entry.ssid == (const char *)ssid; }); [ssid](const wifi_entry &entry){ return entry.ssid == ssid; });
if (configIter == std::end(sta_config.wifis)) if (configIter == std::end(sta_config.wifis))
{ {
ESP_LOGW(TAG, "could not find config for ssid %s", scanResultIter->ssid); ESP_LOGW(TAG, "could not find config for ssid %.*s", ssid.size(), ssid.data());
return nextConnectPlanItem(config, sta_config, scanResult); return nextConnectPlanItem(config, sta_config, scanResult);
} }
ESP_LOGI(TAG, "connecting to %s (auth=%s, key=%.*s, channel=%i, rssi=%i, bssid=%s)", ESP_LOGI(TAG, "connecting to %.*s (auth=%s, key=%.*s, channel=%i, rssi=%i, bssid=%s)",
(const char *)scanResultIter->ssid, ssid.size(), ssid.data(),
toString(scanResultIter->authmode).c_str(), toString(scanResultIter->authmode).c_str(),
configIter->key.size(), configIter->key.data(), configIter->key.size(), configIter->key.data(),
scanResultIter->primary, scanResultIter->primary,