Merge branch 'master' into feature/network_refactoring

libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino

@@ -15,7 +15,7 @@
 static bool eth_connected = false;
 
 // WARNING: WiFiEvent is called from a separate FreeRTOS task (thread)!
-void WiFiEvent(WiFiEvent_t event)
+void onEvent(WiFiEvent_t event)
 {
   switch (event) {
     case ARDUINO_EVENT_ETH_START:
@@ -72,7 +72,7 @@ void testClient(const char * host, uint16_t port)
 void setup()
 {
   Serial.begin(115200);
-  Network.onEvent(onEvent);
+  Network.onEvent(onEvent); // Will call onEvent in another thread
   ETH.begin(ETH_TYPE, ETH_ADDR, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_POWER_PIN, ETH_CLK_MODE);
 }
 

libraries/WiFi/src/WiFiGeneric.cpp

@@ -1247,9 +1247,75 @@ bool WiFiGenericClass::setDualAntennaConfig(uint8_t gpio_ant1, uint8_t gpio_ant2
 // ------------------------------------------------ Generic Network function ---------------------------------------------
 // -----------------------------------------------------------------------------------------------------------------------
 
+/**
+ * DNS callback
+ * @param name
+ * @param ipaddr
+ * @param callback_arg
+ */
+static void wifi_dns_found_callback(const char *name, const ip_addr_t *ipaddr, void *callback_arg)
+{
+    if(ipaddr) {
+        (*reinterpret_cast<IPAddress*>(callback_arg)) = ipaddr->u_addr.ip4.addr;
+    }
+    xEventGroupSetBits(_arduino_event_group, WIFI_DNS_DONE_BIT);
+}
+
+typedef struct gethostbynameParameters {
+    const char *hostname;
+    ip_addr_t addr;
+    void *callback_arg;
+} gethostbynameParameters_t;
+
+/**
+ * Callback to execute dns_gethostbyname in lwIP's TCP/IP context
+ * @param param Parameters for dns_gethostbyname call
+ */
+static esp_err_t wifi_gethostbyname_tcpip_ctx(void *param)
+{
+    gethostbynameParameters_t *parameters = static_cast<gethostbynameParameters_t *>(param);
+    return dns_gethostbyname(parameters->hostname, &parameters->addr, &wifi_dns_found_callback, parameters->callback_arg);
+}
+
+/**
+ * Resolve the given hostname to an IP address. If passed hostname is an IP address, it will be parsed into IPAddress structure.
+ * @param aHostname     Name to be resolved or string containing IP address
+ * @param aResult       IPAddress structure to store the returned IP address
+ * @return 1 if aIPAddrString was successfully converted to an IP address,
+ *          else error code
+ */
+int WiFiGenericClass::hostByName(const char* aHostname, IPAddress& aResult)
+{
+    if (!aResult.fromString(aHostname))
+    {
+        gethostbynameParameters_t params;
+        params.hostname = aHostname;
+        params.callback_arg = &aResult;
+        aResult = static_cast<uint32_t>(0);
+        waitStatusBits(WIFI_DNS_IDLE_BIT, 16000);
+        clearStatusBits(WIFI_DNS_IDLE_BIT | WIFI_DNS_DONE_BIT);
+        err_t err = esp_netif_tcpip_exec(wifi_gethostbyname_tcpip_ctx, &params);
+        if(err == ERR_OK && params.addr.u_addr.ip4.addr) {
+            aResult = params.addr.u_addr.ip4.addr;
+        } else if(err == ERR_INPROGRESS) {
+            waitStatusBits(WIFI_DNS_DONE_BIT, 15000);  //real internal timeout in lwip library is 14[s]
+            clearStatusBits(WIFI_DNS_DONE_BIT);
+        }
+        setStatusBits(WIFI_DNS_IDLE_BIT);
+        if((uint32_t)aResult == 0){
+            log_e("DNS Failed for %s", aHostname);
+        }
+    }
+    return (uint32_t)aResult != 0;
+}
+
 /*
  * Deprecated Methods
 */
+// int WiFiGenericClass::hostByName(const char* aHostname, IPAddress& aResult)
+// {
+//     return Network.hostByName(aHostname, aResult);
+// }
 
 IPAddress WiFiGenericClass::calculateNetworkID(IPAddress ip, IPAddress subnet) {
     IPAddress networkID;
@@ -1294,11 +1360,6 @@ uint8_t WiFiGenericClass::calculateSubnetCIDR(IPAddress subnetMask) {
     return CIDR;
 }
 
-int WiFiGenericClass::hostByName(const char* aHostname, IPAddress& aResult)
-{
-    return Network.hostByName(aHostname, aResult);
-}
-
 wifi_event_id_t WiFiGenericClass::onEvent(WiFiEventCb cbEvent, arduino_event_id_t event)
 {
     return Network.onEvent(cbEvent, event);