Skip to content

Initialize SoftAP DhcpServer object on demand #8546

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 21 commits into from
Jun 1, 2022
Merged

Initialize SoftAP DhcpServer object on demand #8546

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2a46b8f
Initialize SoftAP DhcpServer object on demand
mcspr Apr 19, 2022
953cae8
nonos helpers have a separate header
mcspr Apr 19, 2022
bb5a7d3
wifi ap needs this anyway, simplify sketch includes
mcspr Apr 19, 2022
666bab4
missing example
mcspr Apr 19, 2022
92d7cd6
existing name :/
mcspr Apr 19, 2022
f42de0a
trying to fix header dependency
mcspr Apr 19, 2022
70b89c5
restyle
mcspr Apr 20, 2022
ea92ded
not a c header
mcspr Apr 20, 2022
cc5fc18
no need to init
mcspr Apr 20, 2022
f650e1e
Merge branch 'master' into dhcps-init-tweaks
mcspr Apr 21, 2022
955c19a
move dhcp server getter to WiFi
mcspr May 8, 2022
8a76b20
...move things back, still expose as WiFi method
mcspr May 19, 2022
a69d87a
review fix
mcspr May 19, 2022
6d39ad4
Merge remote-tracking branch 'fork/dhcps-init-tweaks' into dhcps-init…
mcspr May 19, 2022
bfd67da
include -nonos header in wifi lib though
mcspr May 19, 2022
9bc2cb8
Merge remote-tracking branch 'origin/master' into dhcps-init-tweaks
mcspr May 19, 2022
91ad893
no more lwip include
mcspr May 19, 2022
205f769
Merge remote-tracking branch 'origin/master' into dhcps-init-tweaks
mcspr Jun 1, 2022
efae1be
style
mcspr Jun 1, 2022
f5a417a
need mock dhcpserver instance
mcspr Jun 1, 2022
801bc4b
Merge branch 'master' into dhcps-init-tweaks
d-a-v Jun 1, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
no need to init
  • Loading branch information
@mcspr
mcspr committed Apr 20, 2022
commit cc5fc18da5fbbffbabcd380892b372666740d6b8
6 changes: 2 additions & 4 deletions cores/esp8266/LwipDhcpServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;
#define LWIP_IS_OK(what, err) ((err) == ERR_OK)
#endif

const uint32 DhcpServer::magic_cookie = 0x63538263; // https://tools.ietf.org/html/rfc1497

////////////////////////////////////////////////////////////////////////////////////

DhcpServer::DhcpServer(netif* netif) : _netif(netif) { }
Expand Down Expand Up @@ -489,7 +487,7 @@ void DhcpServer::create_msg(struct dhcps_msg* m)
memset((char*)m->sname, 0, sizeof(m->sname));
memset((char*)m->file, 0, sizeof(m->file));
memset((char*)m->options, 0, sizeof(m->options));
memcpy((char*)m->options, &magic_cookie, sizeof(magic_cookie));
memcpy((char*)m->options, &MagicCookie, sizeof(MagicCookie));
}
///////////////////////////////////////////////////////////////////////////////////
/*
Expand Down Expand Up @@ -794,7 +792,7 @@ uint8_t DhcpServer::parse_options(uint8_t* optptr, sint16_t len)
///////////////////////////////////////////////////////////////////////////////////
sint16_t DhcpServer::parse_msg(struct dhcps_msg* m, u16_t len)
{
if (memcmp((char*)m->options, &magic_cookie, sizeof(magic_cookie)) == 0)
if (memcmp((char*)m->options, &MagicCookie, sizeof(MagicCookie)) == 0)
{
struct ipv4_addr ip;
memcpy(&ip.addr, m->ciaddr, sizeof(ip.addr));
Expand Down
10 changes: 2 additions & 8 deletions cores/esp8266/LwipDhcpServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,8 @@
class DhcpServer
{
public:
static constexpr int DefaultLeaseTime = 120 /* seconds */;
static constexpr ip_info DefaultIpConfig = {
.ip { 0x0104a8c0 }, // 192.168.4.1
.netmask { 0x00ffffff }, // 255.255.255.0
.gw { 0 } // 0.0.0.0
};

static const uint32 magic_cookie;
static constexpr int DefaultLeaseTime = 120; // seconds
static constexpr uint32 MagicCookie = 0x63538263; // https://tools.ietf.org/html/rfc1497

DhcpServer(netif*);
~DhcpServer();
Expand Down
7 changes: 4 additions & 3 deletions libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,11 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* psk, int channel,
struct ip_info ip;
if(wifi_get_ip_info(SOFTAP_IF, &ip)) {
if(ip.ip.addr == 0x00000000) {
// Invalid config
DEBUG_WIFI("[AP] IP config Invalid resetting...\n");
//192.168.4.1 , 192.168.4.1 , 255.255.255.0
ret = softAPConfig(0x0104A8C0, 0x0104A8C0, 0x00FFFFFF);
ret = softAPConfig(
0x0104A8C0 /* 192.168.4.1 */,
0x0104A8C0 /* 192.168.4.1 */,
0x00FFFFFF /* 255.255.255.0 */);
if(!ret) {
DEBUG_WIFI("[AP] softAPConfig failed!\n");
ret = false;
Expand Down