jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 20:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12839 from sillyfrog/range-extender-upstream

Browse Source 
Fix race condition on rapid reconnect
This commit is contained in:
Theo Arends 2021-08-08 10:17:12 +02:00 committed by GitHub
commit f33f5cbfe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/xdrv_58_range_extender.ino
View File

@ -133,6 +133,7 @@ void (*const DrvRgxCommand[])(void) PROGMEM = {
typedef struct typedef struct
{ {
uint8_t status = RGX_NOT_CONFIGURED; uint8_t status = RGX_NOT_CONFIGURED;
uint16_t lastlinkcount = 0;
#ifdef USE_WIFI_RANGE_EXTENDER_NAPT #ifdef USE_WIFI_RANGE_EXTENDER_NAPT
bool napt_enabled = false; bool napt_enabled = false;
#endif // USE_WIFI_RANGE_EXTENDER_NAPT #endif // USE_WIFI_RANGE_EXTENDER_NAPT
@ -280,6 +281,7 @@ void rngxSetup()
WiFi.softAP(SettingsText(SET_RGX_SSID), SettingsText(SET_RGX_PASSWORD)); WiFi.softAP(SettingsText(SET_RGX_SSID), SettingsText(SET_RGX_PASSWORD));
AddLog(LOG_LEVEL_INFO, PSTR("RGX: WiFi Extender AP Enabled with SSID: %s"), WiFi.softAPSSID().c_str()); AddLog(LOG_LEVEL_INFO, PSTR("RGX: WiFi Extender AP Enabled with SSID: %s"), WiFi.softAPSSID().c_str());
RgxSettings.status = RGX_SETUP_NAPT; RgxSettings.status = RGX_SETUP_NAPT;
RgxSettings.lastlinkcount = Wifi.link_count;
} }
void rngxSetupNAPT(void) void rngxSetupNAPT(void)
@ -357,7 +359,7 @@ bool Xdrv58(uint8_t function)
case FUNC_PRE_INIT: case FUNC_PRE_INIT:
break; break;
case FUNC_EVERY_SECOND: case FUNC_EVERY_SECOND:
// AddLog(LOG_LEVEL_INFO, PSTR("RGX: XXX DEBUG INFO: Wifi.status: %d, WiFi.getMode(): %d, RgxSettings.status: %d"), Wifi.status, WiFi.getMode(), RgxSettings.status); // AddLog(LOG_LEVEL_INFO, PSTR("RGX: XXX DEBUG: Wifi.status: %d, WiFi.getMode(): %d, RgxSettings.status: %d, link_count: %d"), Wifi.status, WiFi.getMode(), RgxSettings.status, Wifi.link_count);
if (RgxSettings.status == RGX_NOT_CONFIGURED && Wifi.status == WL_CONNECTED) if (RgxSettings.status == RGX_NOT_CONFIGURED && Wifi.status == WL_CONNECTED)
{ {
// Setup only if WiFi in STA only mode // Setup only if WiFi in STA only mode
@ -388,6 +390,12 @@ bool Xdrv58(uint8_t function)
AddLog(LOG_LEVEL_INFO, PSTR("RGX: No longer connected, prepare to reconnect WiFi AP...")); AddLog(LOG_LEVEL_INFO, PSTR("RGX: No longer connected, prepare to reconnect WiFi AP..."));
RgxSettings.status = RGX_NOT_CONFIGURED; RgxSettings.status = RGX_NOT_CONFIGURED;
} }
else if (RgxSettings.lastlinkcount != Wifi.link_count && WiFi.getMode() != WIFI_AP_STA)
{
// Assume WiFi has reconnected and been reconfigured, prepare to reconnect
AddLog(LOG_LEVEL_INFO, PSTR("RGX: Link count now: %d, WiFi.getMode(): %d, unconfigure..."), Wifi.link_count, WiFi.getMode());
RgxSettings.status = RGX_NOT_CONFIGURED;
}
} }
break; break;
} }