From 45a325bd3440cfb55f620a985098ab695d3ecb46 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Thu, 9 Feb 2017 16:57:34 -0600 Subject: [PATCH] fix validippassword abstracted ap password validation passing a invalid password should be fatal , not fallback to null, but could be an optional define --- WiFiManager.cpp | 4 ++-- WiFiManager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 1f9abe8..35f9b43 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -176,7 +176,7 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo _apName = apName; _apPassword = apPassword; - if(!validApPassword) return; + if(!validApPassword()) return false; // do AP callback if set if ( _apcallback != NULL) { @@ -833,7 +833,7 @@ String WiFiManager::toStringIp(IPAddress ip) { return res; } -bool WiFiManager::validApPassword(){ +boolean WiFiManager::validApPassword(){ // check that ap password is valid, return false if (_apPassword != NULL) { if (strlen(_apPassword) < 8 || strlen(_apPassword) > 63) { diff --git a/WiFiManager.h b/WiFiManager.h index 86a215d..0fccf97 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -170,7 +170,6 @@ class WiFiManager void handle204(); boolean captivePortal(); boolean configPortalHasTimeout(); - boolean validApPassword(); // DNS server const byte DNS_PORT = 53; @@ -179,6 +178,7 @@ class WiFiManager int getRSSIasQuality(int RSSI); boolean isIp(String str); String toStringIp(IPAddress ip); + boolean validApPassword(); boolean connect; boolean _debug = true;