make connect by hostname able to run async

me-no-dev · Aug 19, 2016 · cc4d1ac · cc4d1ac · omersiar · Mar 23, 2018
1 parent 6271c62
commit cc4d1ac
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/src/ESPAsyncTCP.cpp b/src/ESPAsyncTCP.cpp
@@ -25,8 +25,8 @@
 extern "C"{
   #include "lwip/opt.h"
   #include "lwip/tcp.h"
-  //#include "lwip/tcp_impl.h"
   #include "lwip/inet.h"
+  #include "lwip/dns.h"
 }
 
 #ifdef ESP8266
@@ -54,13 +54,13 @@ AsyncClient::AsyncClient(tcp_pcb* pcb):
   , _recv_cb_arg(0)
   , _timeout_cb(0)
   , _timeout_cb_arg(0)
-  , _refcnt(0)
   , _pcb_busy(false)
   , _pcb_sent_at(0)
   , _close_pcb(false)
   , _ack_pcb(true)
   , _rx_last_packet(0)
   , _rx_since_timeout(0)
+  , _connect_port(0)
   , prev(NULL)
   , next(NULL)
 {
@@ -112,6 +112,26 @@ bool AsyncClient::connect(IPAddress ip, uint16_t port){
   return true;
 }
 
+bool AsyncClient::connect(const char* host, uint16_t port) {
+  IPAddress remote_addr;
+  ip_addr_t addr;
+  remote_addr = static_cast<uint32_t>(0);
+
+  if(remote_addr.fromString(host)) {
+    return connect(remote_addr, port);
+  }
+
+  err_t err = dns_gethostbyname(host, &addr, (dns_found_callback)&_s_dns_found, this);
+  if(err == ERR_OK) {
+    remote_addr = addr.addr;
+    return connect(remote_addr, port);
+  } else if(err == ERR_INPROGRESS) {
+    _connect_port = port;
+    return true;
+  }
+  return false;
+}
+
 AsyncClient& AsyncClient::operator=(const AsyncClient& other){
   if (_pcb)
     _close();
@@ -336,6 +356,13 @@ int8_t AsyncClient::_poll(tcp_pcb* pcb){
 
 // lWIP Callbacks
 
+void AsyncClient::_s_dns_found(const char *name, ip_addr_t *ipaddr, void *arg){
+  AsyncClient* c = reinterpret_cast<AsyncClient*>(arg);
+  IPAddress remote_addr;
+  remote_addr = ipaddr->addr;
+  c->connect(remote_addr, c->_connect_port);
+}
+
 int8_t AsyncClient::_s_poll(void *arg, struct tcp_pcb *tpcb) {
   return reinterpret_cast<AsyncClient*>(arg)->_poll(tpcb);
 }
@@ -371,15 +398,6 @@ AsyncClient & AsyncClient::operator+=(const AsyncClient &other) {
   return *this;
 }
 
-
-// Make this async
-bool AsyncClient::connect(const char* host, uint16_t port){
-  IPAddress remote_addr;
-  if (WiFi.hostByName(host, remote_addr))
-    return connect(remote_addr, port);
-  return false;
-}
-
 void AsyncClient::setRxTimeout(uint32_t timeout){
   _rx_since_timeout = timeout;
 }

diff --git a/src/ESPAsyncTCP.h b/src/ESPAsyncTCP.h
@@ -43,6 +43,7 @@ typedef std::function<void(void*, AsyncClient*, uint32_t time)> AcTimeoutHandler
 
 struct tcp_pcb;
 struct pbuf;
+struct ip_addr;
 
 class AsyncClient {
   protected:
@@ -62,14 +63,14 @@ class AsyncClient {
     void* _timeout_cb_arg;
     AcConnectHandler _poll_cb;
     void* _poll_cb_arg;
-    int _refcnt;
     bool _pcb_busy;
     uint32_t _pcb_sent_at;
     bool _close_pcb;
     bool _ack_pcb;
     uint32_t _rx_ack_len;
     uint32_t _rx_last_packet;
     uint32_t _rx_since_timeout;
+    uint16_t _connect_port;
 
     int8_t _close();
     int8_t _connected(void* pcb, int8_t err);
@@ -82,6 +83,7 @@ class AsyncClient {
     static void _s_error(void *arg, int8_t err);
     static int8_t _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len);
     static int8_t _s_connected(void* arg, void* tpcb, int8_t err);
+    static void _s_dns_found(const char *name, struct ip_addr *ipaddr, void *arg);
 
   public:
     AsyncClient* prev;