Merge pull request #17 from esp8266/esp8266

pull latest changes

Author: ficeto

hardware/esp8266com/esp8266/cores/esp8266/libc_replacements.c

@@ -175,6 +175,9 @@ char* ICACHE_FLASH_ATTR strtok_r(char * str, const char * delimiters, char ** te
     uint32_t size = 0;
 
     if(str == NULL) {
+        if(temp == NULL) {
+            return NULL;
+        }
         start = *temp;
     } else {
         start = str;
@@ -184,6 +187,10 @@ char* ICACHE_FLASH_ATTR strtok_r(char * str, const char * delimiters, char ** te
         return NULL;
     }
 
+    if(delimiters == NULL) {
+        return NULL;
+    }
+
     end = start;
 
     while(1) {
@@ -211,7 +218,9 @@ char* ICACHE_FLASH_ATTR strtok_r(char * str, const char * delimiters, char ** te
 }
 
 char* ICACHE_FLASH_ATTR strtok(char * str, const char * delimiters) {
-    return strtok_r(str, delimiters, NULL);
+    static char * ret = NULL;
+    ret = strtok_r(str, delimiters, &ret);
+    return ret;
 }
 
 int strcasecmp(const char * str1, const char * str2) {

hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino

@@ -69,6 +69,5 @@ void setup(void){
 }
 
 void loop(void){
-  mdns.update();
   server.handleClient();
 } 

hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino

@@ -308,6 +308,5 @@ void setup(void){
 }
 
 void loop(void){
-  //mdns.update();
   server.handleClient();
 }

hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/WiFiUdp.cpp

@@ -21,7 +21,8 @@
 */
 
 #define LWIP_INTERNAL
-
+#include <functional>
+  
 extern "C" 
 {
     #include "include/wl_definitions.h"
@@ -168,7 +169,6 @@ int WiFiUDP::endPacket()
         return 0;
 
     _ctx->send();
-    _ctx->disconnect();
     return 1;
 }
 

hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/include/UdpContext.h

@@ -28,9 +28,13 @@ extern "C" void esp_schedule();
 
 #define GET_IP_HDR(pb) reinterpret_cast<ip_hdr*>(((uint8_t*)((pb)->payload)) - UDP_HLEN - IP_HLEN);
 #define GET_UDP_HDR(pb) reinterpret_cast<udp_hdr*>(((uint8_t*)((pb)->payload)) - UDP_HLEN);
+
 class UdpContext
 {
 public:
+
+    typedef std::function<void(void)> rxhandler_t;
+
     UdpContext()
     : _pcb(0)
     , _rx_buf(0)
@@ -40,8 +44,11 @@ class UdpContext
     , _tx_buf_head(0)
     , _tx_buf_cur(0)
     , _tx_buf_offset(0)
+    , _multicast_ttl(1)
+    , _dest_port(0)
     {
         _pcb = udp_new();
+        _dest_addr.addr = 0;
     }
 
     ~UdpContext()
@@ -79,8 +86,9 @@ class UdpContext
 
     bool connect(ip_addr_t addr, uint16_t port)
     {
-        err_t err = udp_connect(_pcb, &addr, port);
-        return err == ERR_OK;
+        _dest_addr = addr;
+        _dest_port = port;
+        return true;
     }
 
     bool listen(ip_addr_t addr, uint16_t port)
@@ -107,7 +115,13 @@ class UdpContext
         // newer versions of lwip have an additional field (mcast_ttl) for this purpose
         // and a macro to set it instead of direct field access
         // udp_set_multicast_ttl(_pcb, ttl);
-        _pcb->ttl = ttl;
+        _multicast_ttl = ttl;
+    }
+
+    // warning: handler is called from tcp stack context
+    // esp_yield and non-reentrant functions which depend on it will fail
+    void onRx(rxhandler_t handler) {
+        _on_rx = handler;
     }
 
     size_t getSize() const
@@ -173,10 +187,10 @@ class UdpContext
         return _rx_buf != 0;
     }
 
-    char read()
+    int read()
     {
         if (!_rx_buf || _rx_buf->len == _rx_buf_offset)
-            return 0;
+            return -1;
 
         char c = reinterpret_cast<char*>(_rx_buf->payload)[_rx_buf_offset];
         _consume(1);
@@ -190,7 +204,7 @@ class UdpContext
 
         size_t max_size = _rx_buf->len - _rx_buf_offset;
         size = (size < max_size) ? size : max_size;
-        DEBUGV(":rd %d, %d, %d\r\n", size, _rx_buf->len, _rx_buf_offset);
+        DEBUGV(":urd %d, %d, %d\r\n", size, _rx_buf->len, _rx_buf_offset);
 
         os_memcpy(dst, reinterpret_cast<char*>(_rx_buf->payload) + _rx_buf_offset, size);        
         _consume(size);
@@ -257,10 +271,19 @@ class UdpContext
             }
         }
 
-        if (addr)
-            udp_sendto(_pcb, _tx_buf_head, addr, port);
-        else
-            udp_send(_pcb, _tx_buf_head);
+        if (!addr) {
+            addr = &_dest_addr;
+            port = _dest_port;
+        }
+
+        uint16_t old_ttl = _pcb->ttl;
+        if (ip_addr_ismulticast(addr)) {
+            _pcb->ttl = _multicast_ttl;
+        }
+
+        udp_sendto(_pcb, _tx_buf_head, addr, port);
+
+        _pcb->ttl = old_ttl;
 
         for (pbuf* p = _tx_buf_head; p; p = p->next)
         {
@@ -281,7 +304,7 @@ class UdpContext
 
     void _reserve(size_t size)
     {
-        const size_t pbuf_unit_size = 1024;
+        const size_t pbuf_unit_size = 512;
         if (!_tx_buf_head)
         {
             _tx_buf_head = pbuf_alloc(PBUF_TRANSPORT, pbuf_unit_size, PBUF_RAM);
@@ -317,16 +340,19 @@ class UdpContext
         {
             // there is some unread data
             // chain the new pbuf to the existing one
-            DEBUGV(":rch %d, %d\r\n", _rx_buf->tot_len, pb->tot_len);
+            DEBUGV(":urch %d, %d\r\n", _rx_buf->tot_len, pb->tot_len);
             pbuf_cat(_rx_buf, pb);
         }
         else
         {
-            DEBUGV(":rn %d\r\n", pb->tot_len);
+            DEBUGV(":urn %d\r\n", pb->tot_len);
             _first_buf_taken = false;
             _rx_buf = pb;
             _rx_buf_offset = 0;
         }
+        if (_on_rx) {
+            _on_rx();
+        }
     }
 
 
@@ -341,13 +367,20 @@ class UdpContext
     int _refcnt;
     udp_pcb* _pcb;
 
+    ip_addr_t _dest_addr;
+    uint16_t _dest_port;
+
+    uint16_t _multicast_ttl;
+
     bool _first_buf_taken;
     pbuf* _rx_buf;
     size_t _rx_buf_offset;
 
     pbuf* _tx_buf_head;
     pbuf* _tx_buf_cur;
     size_t _tx_buf_offset;
+
+    rxhandler_t _on_rx;
 };
 
 

hardware/esp8266com/esp8266/libraries/ESP8266mDNS/ESP8266mDNS.cpp

@@ -42,13 +42,18 @@ License (MIT license):
 #define TTL_OFFSET 4
 #define IP_OFFSET 10
 
+static const IPAddress MDNS_MULTICAST_ADDR(224, 0, 0, 251);
+static const int MDNS_MULTICAST_TTL = 1;
+static const int MDNS_PORT = 5353;
+
 
 MDNSResponder::MDNSResponder()
   : _expected(NULL)
   , _expectedLen(0)
   , _response(NULL)
   , _responseLen(0)
   , _index(0)
+  , _conn(0)
 { }
 
 MDNSResponder::~MDNSResponder() {
@@ -149,21 +154,37 @@ bool MDNSResponder::begin(const char* domain, IPAddress addr, uint32_t ttlSecond
   records[IP_OFFSET + 0] = (uint8_t) ipAddress;
 
   // Open the MDNS socket if it isn't already open.
-  if (!_mdnsConn) {
-    if (!_mdnsConn.beginMulticast(addr, IPAddress(224, 0, 0, 251), 5353)) {
+  if (!_conn) {
+    ip_addr_t ifaddr;
+    ifaddr.addr = (uint32_t) addr;
+    ip_addr_t multicast_addr;
+    multicast_addr.addr = (uint32_t) MDNS_MULTICAST_ADDR;
+
+    if (igmp_joingroup(&ifaddr, &multicast_addr)!= ERR_OK) {
       return false;
     }
-  }
 
+    _conn = new UdpContext;
+    _conn->ref();
+
+    if (!_conn->listen(*IP_ADDR_ANY, MDNS_PORT)) {
+      return false;
+    }
+    _conn->setMulticastInterface(ifaddr);
+    _conn->setMulticastTTL(MDNS_MULTICAST_TTL);
+    _conn->onRx(std::bind(&MDNSResponder::update, this));
+    _conn->connect(multicast_addr, MDNS_PORT);
+  }
   return true;
 }
 
 void MDNSResponder::update() {
-  if (!_mdnsConn.parsePacket())
-    return;
+  if (!_conn->next()) {
+    return; 
+  }
 
   // Read available data.
-  int n = _mdnsConn.available();
+  int n = _conn->getSize();
 
   _index = 0;
 
@@ -172,7 +193,7 @@ void MDNSResponder::update() {
 #endif
   // Look for domain name in request and respond with canned response if found.
   for (int i = 0; i < n; ++i) {
-    uint8_t ch = tolower(_mdnsConn.read());
+    uint8_t ch = tolower(_conn->read());
 
 #ifdef MDNS_DEBUG
     String str(ch, 16);
@@ -191,9 +212,12 @@ void MDNSResponder::update() {
         Serial.print("responding, i=");
         Serial.println(i);
 #endif
-        _mdnsConn.beginPacketMulticast(IPAddress(224, 0, 0, 251), 5353, _localAddr);
-        _mdnsConn.write(_response, _responseLen);
-        _mdnsConn.endPacket();
+        ip_addr_t multicast_addr;
+        multicast_addr.addr = (uint32_t) MDNS_MULTICAST_ADDR;
+
+        _conn->append(reinterpret_cast<const char*>(_response), _responseLen);
+        _conn->send();
+
         _index = 0;
       }
     }

hardware/esp8266com/esp8266/libraries/ESP8266mDNS/ESP8266mDNS.h

@@ -46,6 +46,9 @@ License (MIT license):
 #include "ESP8266WiFi.h"
 #include "WiFiUdp.h"
 
+
+class UdpContext;
+
 class MDNSResponder {
 public:
   MDNSResponder();
@@ -63,7 +66,7 @@ class MDNSResponder {
   uint8_t* _response;
   int _responseLen;
   // Socket for MDNS communication
-  WiFiUDP _mdnsConn;
+  UdpContext* _conn;
   // local IP Address
   IPAddress _localAddr;
 };

hardware/esp8266com/esp8266/libraries/ESP8266mDNS/examples/mDNS_Web_Server/mDNS_Web_Server.ino

@@ -68,9 +68,6 @@ void setup(void)
 
 void loop(void)
 {
-  // Check for any mDNS queries and send responses
-  mdns.update();
-  
   // Check if a client has connected
   WiFiClient client = server.available();
   if (!client) {