LEA mDNS v2

cores/esp8266/IPAddress.h

@@ -32,6 +32,13 @@
 struct ip_addr: ipv4_addr { };
 #endif // !LWIP_IPV6
 
+// to display a netif id with printf:
+#define NETIFID_STR        "%c%c%u"
+#define NETIFID_VAL(netif) \
+        ((netif)? (netif)->name[0]: '-'),     \
+        ((netif)? (netif)->name[1]: '-'),     \
+        ((netif)? netif_get_index(netif): 42)
+
 // A class to make it easier to handle and pass around IP addresses
 // IPv6 update:
 // IPAddress is now a decorator class for lwIP's ip_addr_t

cores/esp8266/LwipIntf.h

@@ -0,0 +1,25 @@
+
+#ifndef _LWIPINTF_H
+#define _LWIPINTF_H
+
+#include <lwip/netif.h>
+
+#include <functional>
+
+class LwipIntf
+{
+private:
+
+    LwipIntf () { }
+
+protected:
+
+    static bool stateChangeSysCB (std::function<void(netif*)>&& cb);
+
+public:
+
+    static bool stateUpCB (std::function<void(netif*)>&& cb);
+
+};
+
+#endif // _LWIPINTF_H

cores/esp8266/LwipIntfCB.cpp

@@ -0,0 +1,42 @@
+
+#include <LwipIntf.h>
+#include <Schedule.h>
+#include <debug.h>
+
+#define NETIF_STATUS_CB_SIZE 3
+
+static int netifStatusChangeListLength = 0;
+std::function<void(netif*)> netifStatusChangeList [NETIF_STATUS_CB_SIZE];
+
+extern "C" void netif_status_changed (struct netif* netif)
+{
+    // override the default empty weak function
+    for (int i = 0; i < netifStatusChangeListLength; i++)
+        netifStatusChangeList[i](netif);
+}
+
+bool LwipIntf::stateChangeSysCB (std::function<void(netif*)>&& cb)
+{
+    if (netifStatusChangeListLength >= NETIF_STATUS_CB_SIZE)
+    {
+#if defined(DEBUG_ESP_CORE)
+        DEBUGV("NETIF_STATUS_CB_SIZE is too low\n");
+#endif
+        return false;
+    }
+
+    netifStatusChangeList[netifStatusChangeListLength++] = cb;
+    return true;
+}
+
+bool LwipIntf::stateUpCB (std::function<void(netif*)>&& cb)
+{
+    return stateChangeSysCB([cb](netif* nif)
+    {
+        if (netif_is_up(nif))
+            schedule_function([cb, nif]()
+            {
+                cb(nif);
+            });
+    });
+}

libraries/ArduinoOTA/ArduinoOTA.cpp

@@ -21,6 +21,7 @@ extern "C" {
 #include "include/UdpContext.h"
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
+//#define MDNS2_EXPERIMENTAL_V1COMPAT
 #include <ESP8266mDNS.h>
 #endif
 

libraries/ESP8266WiFi/src/include/UdpContext.h

@@ -30,6 +30,7 @@ void esp_schedule();
 }
 
 #include <AddrList.h>
+#include <PolledTimeout.h>
 
 #define PBUF_ALIGNER_ADJUST 4
 #define PBUF_ALIGNER(x) ((void*)((((intptr_t)(x))+3)&~3))
@@ -390,7 +391,16 @@ class UdpContext
         return size;
     }
 
-    bool send(const ip_addr_t* addr = 0, uint16_t port = 0)
+    void cancelBuffer ()
+    {
+        if (_tx_buf_head)
+            pbuf_free(_tx_buf_head);
+        _tx_buf_head = 0;
+        _tx_buf_cur = 0;
+        _tx_buf_offset = 0;
+    }
+
+    err_t trySend(const ip_addr_t* addr = 0, uint16_t port = 0, bool keepBuffer = true)
     {
         size_t data_size = _tx_buf_offset;
         pbuf* tx_copy = pbuf_alloc(PBUF_TRANSPORT, data_size, PBUF_RAM);
@@ -406,16 +416,12 @@ class UdpContext
                 data_size -= will_copy;
             }
         }
-        if (_tx_buf_head)
-            pbuf_free(_tx_buf_head);
-        _tx_buf_head = 0;
-        _tx_buf_cur = 0;
-        _tx_buf_offset = 0;
+        if (!keepBuffer)
+            cancelBuffer();
         if(!tx_copy){
-            return false;
+            return ERR_MEM;
         }
 
-
         if (!addr) {
             addr = &_pcb->remote_ip;
             port = _pcb->remote_port;
@@ -434,6 +440,25 @@ class UdpContext
         _pcb->ttl = old_ttl;
 #endif
         pbuf_free(tx_copy);
+        if (err == ERR_OK)
+            cancelBuffer();
+        return err;
+    }
+
+    bool send(const ip_addr_t* addr = 0, uint16_t port = 0)
+    {
+        return trySend(addr, port, /* don't keep buffer */false) == ERR_OK;
+    }
+
+    bool sendTimeout(const ip_addr_t* addr, uint16_t port,
+                     esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
+    {
+        err_t err;
+        esp8266::polledTimeout::oneShotFastMs timeout(timeoutMs);
+        while (((err = trySend(addr, port)) != ERR_OK) && !timeout)
+            delay(0);
+        if (err != ERR_OK)
+            cancelBuffer();
         return err == ERR_OK;
     }
 

libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino

@@ -49,8 +49,11 @@
    2. Open 'ESP8266mDNS.h' and set LEAmDNS to default.
 
 */
-#include <ESP8266mDNS.h>
 #include <PolledTimeout.h>
+
+//#define MDNS2_EXPERIMENTAL_V1COMPAT
+#include <ESP8266mDNS.h>
+
 /*
    Global defines and vars
 */