arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

fixed support for psk in WiFiSTA, added support for psk to WiFiMulti, minor code cleanups (#4076)

Browse Source
This commit is contained in:
Develo
2018-01-10 23:15:24 -03:00
committed by GitHub
parent 332e059724
commit 02259a412c
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
View File

@ -38,10 +38,6 @@ bool ESP8266WiFiMulti::addAP(const char* ssid, const char *passphrase) {
return APlistAdd(ssid, passphrase); return APlistAdd(ssid, passphrase);
} }
int ESP8266WiFiMulti::count(void) {
return APlist.size();
}
wl_status_t ESP8266WiFiMulti::run(void) { wl_status_t ESP8266WiFiMulti::run(void) {
wl_status_t status = WiFi.status(); wl_status_t status = WiFi.status();
@ -71,7 +67,7 @@ wl_status_t ESP8266WiFiMulti::run(void) {
if(scanResult > 0) { if(scanResult > 0) {
// scan done, analyze // scan done, analyze
WifiAPlist_t bestNetwork { NULL, NULL }; WifiAPEntry bestNetwork { NULL, NULL };
int bestNetworkDb = INT_MIN; int bestNetworkDb = INT_MIN;
uint8 bestBSSID[6]; uint8 bestBSSID[6];
int32_t bestChannel; int32_t bestChannel;
@ -92,16 +88,14 @@ wl_status_t ESP8266WiFiMulti::run(void) {
WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, BSSID_scan, chan_scan, hidden_scan); WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, BSSID_scan, chan_scan, hidden_scan);
bool known = false; bool known = false;
for(uint32_t x = 0; x < APlist.size(); x++) { for(auto entry : APlist) {
WifiAPlist_t entry = APlist[x];
if(ssid_scan == entry.ssid) { // SSID match if(ssid_scan == entry.ssid) { // SSID match
known = true; known = true;
if(rssi_scan > bestNetworkDb) { // best network if(rssi_scan > bestNetworkDb) { // best network
if(sec_scan == ENC_TYPE_NONE || entry.passphrase) { // check for passphrase if not open wlan if(sec_scan == ENC_TYPE_NONE || entry.passphrase) { // check for passphrase if not open wlan
bestNetworkDb = rssi_scan; bestNetworkDb = rssi_scan;
bestChannel = chan_scan; bestChannel = chan_scan;
memcpy((void*) &bestNetwork, (void*) &entry, sizeof(bestNetwork)); bestNetwork = entry;
memcpy((void*) &bestBSSID, (void*) BSSID_scan, sizeof(bestBSSID)); memcpy((void*) &bestBSSID, (void*) BSSID_scan, sizeof(bestBSSID));
} }
} }
@ -183,7 +177,7 @@ wl_status_t ESP8266WiFiMulti::run(void) {
bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) { bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
WifiAPlist_t newAP; WifiAPEntry newAP;
if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) { if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
// fail SSID to long or missing! // fail SSID to long or missing!
@ -191,7 +185,8 @@ bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
return false; return false;
} }
if(passphrase && strlen(passphrase) > 63) { //for passphrase, max is 63 ascii + null. For psk, 64hex + null.
if(passphrase && strlen(passphrase) > 64) {
// fail passphrase to long! // fail passphrase to long!
DEBUG_WIFI_MULTI("[WIFI][APlistAdd] passphrase to long\n"); DEBUG_WIFI_MULTI("[WIFI][APlistAdd] passphrase to long\n");
return false; return false;
@ -222,8 +217,7 @@ bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
} }
void ESP8266WiFiMulti::APlistClean(void) { void ESP8266WiFiMulti::APlistClean(void) {
for(uint32_t i = 0; i < APlist.size(); i++) { for(auto entry : APlist) {
WifiAPlist_t entry = APlist[i];
if(entry.ssid) { if(entry.ssid) {
free(entry.ssid); free(entry.ssid);
} }

16
libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
View File

@ -28,8 +28,6 @@
#define WIFICLIENTMULTI_H_ #define WIFICLIENTMULTI_H_
#include "ESP8266WiFi.h" #include "ESP8266WiFi.h"
#undef min
#undef max
#include <vector> #include <vector>
#ifdef DEBUG_ESP_WIFI #ifdef DEBUG_ESP_WIFI
@ -42,10 +40,12 @@
#define DEBUG_WIFI_MULTI(...) #define DEBUG_WIFI_MULTI(...)
#endif #endif
typedef struct { struct WifiAPEntry {
char * ssid; char * ssid;
char * passphrase; char * passphrase;
} WifiAPlist_t; };
typedef std::vector<WifiAPEntry> WifiAPlist;
class ESP8266WiFiMulti { class ESP8266WiFiMulti {
public: public:
@ -53,11 +53,11 @@ class ESP8266WiFiMulti {
~ESP8266WiFiMulti(); ~ESP8266WiFiMulti();
bool addAP(const char* ssid, const char *passphrase = NULL); bool addAP(const char* ssid, const char *passphrase = NULL);
int count(void);
wl_status_t run(void); wl_status_t run(void);
private: private:
std::vector<WifiAPlist_t> APlist; WifiAPlist APlist;
bool APlistAdd(const char* ssid, const char *passphrase = NULL); bool APlistAdd(const char* ssid, const char *passphrase = NULL);
void APlistClean(void); void APlistClean(void);

13
libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View File

@ -26,7 +26,6 @@
#include "ESP8266WiFiGeneric.h" #include "ESP8266WiFiGeneric.h"
#include "ESP8266WiFiSTA.h" #include "ESP8266WiFiSTA.h"
extern "C" {
#include "c_types.h" #include "c_types.h"
#include "ets_sys.h" #include "ets_sys.h"
#include "os_type.h" #include "os_type.h"
@ -34,6 +33,8 @@ extern "C" {
#include "mem.h" #include "mem.h"
#include "user_interface.h" #include "user_interface.h"
#include "smartconfig.h" #include "smartconfig.h"
extern "C" {
#include "lwip/err.h" #include "lwip/err.h"
#include "lwip/dns.h" #include "lwip/dns.h"
#include "lwip/init.h" // LWIP_VERSION_ #include "lwip/init.h" // LWIP_VERSION_
@ -62,7 +63,8 @@ static bool sta_config_equal(const station_config& lhs, const station_config& rh
return false; return false;
} }
if(strcmp(reinterpret_cast<const char*>(lhs.password), reinterpret_cast<const char*>(rhs.password)) != 0) { //in case of password, use strncmp with size 64 to cover 64byte psk case (no null term)
if(strncmp(reinterpret_cast<const char*>(lhs.password), reinterpret_cast<const char*>(rhs.password), sizeof(lhs.password)) != 0) {
return false; return false;
} }
@ -116,7 +118,7 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
strcpy(reinterpret_cast<char*>(conf.ssid), ssid); strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
if(passphrase) { if(passphrase) {
if (strlen(passphrase) == 64) // it's not a passphrase, is the PSK if (strlen(passphrase) == 64) // it's not a passphrase, is the PSK, which is copied into conf.password without null term
memcpy(reinterpret_cast<char*>(conf.password), passphrase, 64); memcpy(reinterpret_cast<char*>(conf.password), passphrase, 64);
else else
strcpy(reinterpret_cast<char*>(conf.password), passphrase); strcpy(reinterpret_cast<char*>(conf.password), passphrase);
@ -514,7 +516,10 @@ String ESP8266WiFiSTAClass::SSID() const {
String ESP8266WiFiSTAClass::psk() const { String ESP8266WiFiSTAClass::psk() const {
struct station_config conf; struct station_config conf;
wifi_station_get_config(&conf); wifi_station_get_config(&conf);
return String(reinterpret_cast<char*>(conf.password)); char tmp[65]; //psk is 64 bytes hex => plus null term
memcpy(tmp, conf.password, sizeof(conf.password));
tmp[64] = 0; //null term in case of 64 byte psk
return String(reinterpret_cast<char*>(tmp));
} }
/** /**