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

Fix DNS resolution errors on AP reconnection #13

Merged
merged 4 commits into from
Mar 26, 2019
Merged

Fix DNS resolution errors on AP reconnection #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5caccb
Replace gethostbyname calls with getaddrinfo
sandeepmistry Mar 20, 2019
bbce26d
Call freeaddrinfo after getaddrinfo
sandeepmistry Mar 21, 2019
d458b90
Track if static IP is assigned in separate var, clear event group bit…
sandeepmistry Mar 25, 2019
04ec799
Don't call tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA)
sandeepmistry Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 24 additions & 10 deletions arduino/libraries/WiFi/src/WiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ WiFiClass::WiFiClass() :
{
_eventGroup = xEventGroupCreate();
memset(&_apRecord, 0x00, sizeof(_apRecord));
_staticIp = false;
memset(&_ipInfo, 0x00, sizeof(_ipInfo));
memset(&_dnsServers, 0x00, sizeof(_dnsServers));
}
Expand All @@ -59,15 +60,23 @@ uint8_t WiFiClass::status()

int WiFiClass::hostByName(const char* hostname, /*IPAddress*/uint32_t& result)
{
result = 0xffffffff;
struct addrinfo hints;
struct addrinfo* addr_list;

memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = 0;
hints.ai_protocol = 0;

struct hostent* hostEntry = lwip_gethostbyname(hostname);
result = 0xffffffff;

if (hostEntry == NULL) {
if (getaddrinfo(hostname, NULL, &hints, &addr_list) != 0) {
return 0;
}

memcpy(&result, hostEntry->h_addr_list[0], sizeof(result));

result = ((struct sockaddr_in*)addr_list->ai_addr)->sin_addr.s_addr;

freeaddrinfo(addr_list);

return 1;
}
Expand Down Expand Up @@ -178,6 +187,7 @@ uint8_t WiFiClass::begin(const char* ssid, const char* key)

_interface = ESP_IF_WIFI_STA;

xEventGroupClearBits(_eventGroup, BIT0);
esp_wifi_stop();
esp_wifi_set_mode(WIFI_MODE_STA);
esp_wifi_start();
Expand All @@ -187,11 +197,9 @@ uint8_t WiFiClass::begin(const char* ssid, const char* key)
_status = WL_CONNECT_FAILED;
}

if (_ipInfo.ip.addr) {
if (_staticIp) {
tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &_ipInfo);
} else {
tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA);
}

esp_wifi_connect();
Expand All @@ -213,6 +221,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, uint8_t channel)

_interface = ESP_IF_WIFI_AP;

xEventGroupClearBits(_eventGroup, BIT1);
esp_wifi_stop();
esp_wifi_set_mode(WIFI_MODE_AP);

Expand Down Expand Up @@ -241,6 +250,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, uint8_t key_idx, const char* key, u

_interface = ESP_IF_WIFI_AP;

xEventGroupClearBits(_eventGroup, BIT1);
esp_wifi_stop();
esp_wifi_set_mode(WIFI_MODE_AP);

Expand Down Expand Up @@ -269,6 +279,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, const char* key, uint8_t channel)

_interface = ESP_IF_WIFI_AP;

xEventGroupClearBits(_eventGroup, BIT1);
esp_wifi_stop();
esp_wifi_set_mode(WIFI_MODE_AP);

Expand All @@ -286,6 +297,7 @@ void WiFiClass::config(/*IPAddress*/uint32_t local_ip, /*IPAddress*/uint32_t gat
{
dns_clear_servers(true);

_staticIp = true;
_ipInfo.ip.addr = local_ip;
_ipInfo.gw.addr = gateway;
_ipInfo.netmask.addr = subnet;
Expand Down Expand Up @@ -420,6 +432,8 @@ uint8_t* WiFiClass::BSSID(uint8_t* bssid)

int8_t WiFiClass::scanNetworks()
{
xEventGroupClearBits(_eventGroup, BIT0);
esp_wifi_stop();
esp_wifi_set_mode(WIFI_MODE_STA);
esp_wifi_start();
xEventGroupWaitBits(_eventGroup, BIT0, false, true, portMAX_DELAY);
Expand Down Expand Up @@ -631,7 +645,7 @@ void WiFiClass::handleSystemEvent(system_event_t* event)
case SYSTEM_EVENT_STA_CONNECTED:
esp_wifi_sta_get_ap_info(&_apRecord);

if (_ipInfo.ip.addr) {
if (_staticIp) {
// re-apply the custom DNS settings
setDNS(_dnsServers[0], _dnsServers[1]);

Expand Down Expand Up @@ -688,7 +702,7 @@ void WiFiClass::handleSystemEvent(system_event_t* event)
memcpy(_apRecord.ssid, config.ap.ssid, sizeof(config.ap.ssid));
_apRecord.authmode = config.ap.authmode;

if (_ipInfo.ip.addr) {
if (_staticIp) {
// custom static IP
tcpip_adapter_dhcps_stop(TCPIP_ADAPTER_IF_AP);
tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_AP, &_ipInfo);
Expand Down
1 change: 1 addition & 0 deletions arduino/libraries/WiFi/src/WiFi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ class WiFiClass

wifi_ap_record_t _scanResults[MAX_SCAN_RESULTS];
wifi_ap_record_t _apRecord;
bool _staticIp;
tcpip_adapter_ip_info_t _ipInfo;
uint32_t _dnsServers[2];

Expand Down
11 changes: 6 additions & 5 deletions arduino/libraries/WiFi/src/WiFiClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
#include <errno.h>
#include <string.h>

#include <lwip/netdb.h>
#include <lwip/sockets.h>

#include "WiFi.h"

#include "WiFiClient.h"


Expand All @@ -38,13 +39,13 @@ WiFiClient::WiFiClient(int socket) :

int WiFiClient::connect(const char* host, uint16_t port)
{
struct hostent* server = gethostbyname(host);
uint32_t address;

if (server == NULL) {
return 0;
if (!WiFi.hostByName(host, address)) {
return 0;
}

return connect(server->h_addr, port);
return connect(address, port);
}

int WiFiClient::connect(/*IPAddress*/uint32_t ip, uint16_t port)
Expand Down
11 changes: 6 additions & 5 deletions arduino/libraries/WiFi/src/WiFiUdp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
#include <errno.h>
#include <string.h>

#include <lwip/netdb.h>
#include <lwip/sockets.h>

#include "WiFi.h"

#include "WiFiUdp.h"

WiFiUDP::WiFiUDP() :
Expand Down Expand Up @@ -94,13 +95,13 @@ void WiFiUDP::stop()

int WiFiUDP::beginPacket(const char *host, uint16_t port)
{
struct hostent* server = gethostbyname(host);
uint32_t address;

if (server == NULL) {
return 0;
if (!WiFi.hostByName(host, address)) {
return 0;
}

return beginPacket(server->h_addr, port);
return beginPacket(address, port);
}

int WiFiUDP::beginPacket(/*IPAddress*/uint32_t ip, uint16_t port)
Expand Down