jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make WiFi.softAP() more robust (#1925)

Browse Source 
* make WiFi.softAP() more robust

* WiFi.softAP() revert fallback to WIFI_AUTH_OPEN
This commit is contained in:
Mark D 2018-11-19 10:43:59 -05:00 committed by Me No Dev
parent a3ed511884
commit 14ff311479
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/WiFi/src/WiFiAP.cpp
View File

@ -94,25 +94,28 @@ bool WiFiAPClass::softAP(const char* ssid, const char* passphrase, int channel,
if(!WiFi.enableAP(true)) { if(!WiFi.enableAP(true)) {
// enable AP failed // enable AP failed
log_e("enable AP first!");
return false; return false;
} }
if(!ssid || *ssid == 0 || strlen(ssid) > 31) { if(!ssid || *ssid == 0) {
// fail SSID too long or missing! // fail SSID missing
log_e("SSID missing!");
return false; return false;
} }
if(passphrase && (strlen(passphrase) > 63 || strlen(passphrase) < 8)) { if(passphrase && (strlen(passphrase) > 0 && strlen(passphrase) < 8)) {
// fail passphrase to long or short! // fail passphrase too short
log_e("passphrase too short!");
return false; return false;
} }
esp_wifi_start(); esp_wifi_start();
wifi_config_t conf; wifi_config_t conf;
strcpy(reinterpret_cast<char*>(conf.ap.ssid), ssid); strlcpy(reinterpret_cast<char*>(conf.ap.ssid), ssid, sizeof(conf.ap.ssid));
conf.ap.channel = channel; conf.ap.channel = channel;
conf.ap.ssid_len = strlen(ssid); conf.ap.ssid_len = strlen(reinterpret_cast<char *>(conf.ap.ssid));
conf.ap.ssid_hidden = ssid_hidden; conf.ap.ssid_hidden = ssid_hidden;
conf.ap.max_connection = max_connection; conf.ap.max_connection = max_connection;
conf.ap.beacon_interval = 100; conf.ap.beacon_interval = 100;
@ -122,7 +125,7 @@ bool WiFiAPClass::softAP(const char* ssid, const char* passphrase, int channel,
*conf.ap.password = 0; *conf.ap.password = 0;
} else { } else {
conf.ap.authmode = WIFI_AUTH_WPA2_PSK; conf.ap.authmode = WIFI_AUTH_WPA2_PSK;
strcpy(reinterpret_cast<char*>(conf.ap.password), passphrase); strlcpy(reinterpret_cast<char*>(conf.ap.password), passphrase, sizeof(conf.ap.password));
} }
wifi_config_t conf_current; wifi_config_t conf_current;