Skip to content

Adding softAP SSID & PSK query API #4138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 28, 2018
Merged

Adding softAP SSID & PSK query API #4138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e5c6259
softAP SSID & PSK query API added.
IMAN4K Jan 11, 2018
3b79cb4
Fix for proper C-style string copy
IMAN4K Jan 17, 2018
04d96d9
Merge branch 'master' into master
IMAN4K Jan 18, 2018
6501ba4
Merge branch 'master' into master
IMAN4K Jan 18, 2018
9f3e1bd
Merge branch 'master' into master
IMAN4K Jan 20, 2018
1d74009
Merge branch 'master' into master
devyte Jan 24, 2018
0f6979f
Merge branch 'master' into master
IMAN4K Jan 24, 2018
3ecd00f
Merge branch 'master' into master
IMAN4K Jan 28, 2018
bff42fd
Merge branch 'master' into master
IMAN4K Feb 12, 2018
0339f5e
Merge branch 'master' of github.com:esp8266/Arduino
IMAN4K Feb 19, 2018
dcf64e1
add API to validate input ip as string
IMAN4K Feb 19, 2018
a62c5ab
fix indentation
IMAN4K Feb 19, 2018
60b4a1d
Merge branch 'master' into master
IMAN4K Feb 22, 2018
3a80358
Merge branch 'master' into master
devyte Mar 9, 2018
641d6c5
Merge branch 'master' into master
devyte Mar 18, 2018
a2fe942
Merge branch 'master' into master
IMAN4K Mar 25, 2018
0309ded
Merge branch 'master' into master
IMAN4K Mar 28, 2018
6ca28ab
fix ip string validation to use built-in implementation.
IMAN4K Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,23 @@ String ESP8266WiFiAPClass::softAPmacAddress(void) {
sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
return String(macStr);
}

/**
* Get the configured(Not-In-Flash) softAP SSID name.
* @return String SSID.
*/
String ESP8266WiFiAPClass::softAPSSID() const {
struct softap_config config;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation in this function is different from nearby functions

wifi_softap_get_config(&config);
return String(reinterpret_cast<char*>(config.ssid));
}

/**
* Get the configurd(Not-In-Flash) softAP PSK or PASSWORD.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo -> configured.

* @return String psk.
*/
String ESP8266WiFiAPClass::softAPPSK() const {
struct softap_config config;
wifi_softap_get_config(&config);
return String(reinterpret_cast<char*>(config.password));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second thought, this could cause an issue. When a 64-byte psk is used, it is not 0-terminated, and String assumes a null-terminator.
Instead, a char psk[65] should be declared, config.password should be memcpy()d into it, and then psk[64] = 0;. Then, return String(psk).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@devyte
Yes That's right.
This is the String constructor:

String::String(const char *cstr) {
    init();
    if(cstr)
        copy(cstr, strlen(cstr));
}

}
3 changes: 3 additions & 0 deletions libraries/ESP8266WiFi/src/ESP8266WiFiAP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class ESP8266WiFiAPClass {
uint8_t* softAPmacAddress(uint8_t* mac);
String softAPmacAddress(void);

String softAPSSID() const;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation on this line is different from nearby lines

String softAPPSK() const;

protected:

};
Expand Down