Skip to content
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

Jump to bottom

LwipIntfDev - static IP config for eth interfaces #8076

Merged
merged 4 commits into from
Jun 18, 2021
Merged

LwipIntfDev - static IP config for eth interfaces #8076

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b095c8
LwipIntfDev.h - apply static DNS config
JAndrassy May 23, 2021
4989edb
Merge branch 'master' into LwipInfDev
JAndrassy May 23, 2021
9a37716
Merge branch 'master' into LwipInfDev
JAndrassy May 26, 2021
d9a0126
Merge branch 'master' into LwipInfDev
d-a-v Jun 18, 2021
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
14 changes: 13 additions & 1 deletion cores/esp8266/LwipIntfDev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <lwip/netif.h>
#include <lwip/etharp.h>
#include <lwip/dhcp.h>
#include <lwip/dns.h>
#include <lwip/apps/sntp.h>

#include <user_interface.h> // wifi_get_macaddr()
Expand Down Expand Up @@ -40,7 +41,7 @@ class LwipIntfDev: public LwipIntf, public RawDev
memset(&_netif, 0, sizeof(_netif));
}

boolean config(const IPAddress& local_ip, const IPAddress& arg1, const IPAddress& arg2, const IPAddress& arg3, const IPAddress& dns2);
boolean config(const IPAddress& local_ip, const IPAddress& arg1, const IPAddress& arg2, const IPAddress& arg3 = IPADDR_NONE, const IPAddress& dns2 = IPADDR_NONE);

// default mac-address is inferred from esp8266's STA interface
boolean begin(const uint8_t *macAddress = nullptr, const uint16_t mtu = DEFAULT_MTU);
Expand Down Expand Up @@ -116,6 +117,17 @@ boolean LwipIntfDev<RawDev>::config(const IPAddress& localIP, const IPAddress& g
ip4_addr_set_u32(ip_2_ip4(&_netif.gw), realGateway.v4());
ip4_addr_set_u32(ip_2_ip4(&_netif.netmask), realNetmask.v4());

if (realDns1.isSet())
{
// Set DNS1-Server
dns_setserver(0, realDns1);
}

if (dns2.isSet())
{
// Set DNS2-Server
dns_setserver(1, dns2);
}
return true;
}

Expand Down