Merge branch 'master' into poc-cache-config

Author: mhightower83

libraries/ESP8266SSDP/ESP8266SSDP.cpp

@@ -69,7 +69,7 @@ static const char _ssdp_notify_template[] PROGMEM =
 
 static const char _ssdp_packet_template[] PROGMEM =
   "%s" // _ssdp_response_template / _ssdp_notify_template
-  "CACHE-CONTROL: max-age=%u\r\n" // SSDP_INTERVAL
+  "CACHE-CONTROL: max-age=%u\r\n" // _interval
   "SERVER: Arduino/1.0 UPNP/1.1 %s/%s\r\n" // _modelName, _modelNumber
   "USN: %s\r\n" // _uuid
   "%s: %s\r\n"  // "NT" or "ST", _deviceType
@@ -130,6 +130,7 @@ SSDPClass::SSDPClass() :
   _timer(0),
   _port(80),
   _ttl(SSDP_MULTICAST_TTL),
+  _interval(SSDP_INTERVAL),
   _respondToAddr(0,0,0,0),
   _respondToPort(0),
   _pending(false),
@@ -241,7 +242,7 @@ void SSDPClass::_send(ssdp_method_t method) {
   int len = snprintf_P(buffer, sizeof(buffer),
                        _ssdp_packet_template,
                        valueBuffer,
-                       SSDP_INTERVAL,
+                       _interval,
                        _modelName,
                        _modelNumber,
                        _uuid,
@@ -428,7 +429,7 @@ void SSDPClass::_update() {
   if (_pending && (millis() - _process_time) > _delay) {
     _pending = false; _delay = 0;
     _send(NONE);
-  } else if(_notify_time == 0 || (millis() - _notify_time) > (SSDP_INTERVAL * 1000L)){
+  } else if(_notify_time == 0 || (millis() - _notify_time) > (_interval * 1000L)){
     _notify_time = millis();
     _st_is_uuid = false;
     _send(NOTIFY);
@@ -493,11 +494,14 @@ void SSDPClass::setManufacturerURL(const char *url) {
   strlcpy(_manufacturerURL, url, sizeof(_manufacturerURL));
 }
 
-
 void SSDPClass::setTTL(const uint8_t ttl) {
   _ttl = ttl;
 }
 
+void SSDPClass::setInterval(uint32_t interval) {
+  _interval = interval;
+}
+
 void SSDPClass::_onTimerStatic(SSDPClass* self) {
   self->_update();
 }

libraries/ESP8266SSDP/ESP8266SSDP.h

@@ -71,13 +71,13 @@ class SSDPClass{
     void setUUID(const String& uuid)	{ setUUID(uuid.c_str()); }
     void setUUID(const char *uuid);
 
-	  void setName(const String& name) { setName(name.c_str()); }
+    void setName(const String& name) { setName(name.c_str()); }
     void setName(const char *name);
     void setURL(const String& url) { setURL(url.c_str()); }
     void setURL(const char *url);
     void setSchemaURL(const String& url) { setSchemaURL(url.c_str()); }
     void setSchemaURL(const char *url);
-	  void setSerialNumber(const String& serialNumber) { setSerialNumber(serialNumber.c_str()); }
+    void setSerialNumber(const String& serialNumber) { setSerialNumber(serialNumber.c_str()); }
     void setSerialNumber(const char *serialNumber);
     void setSerialNumber(const uint32_t serialNumber);
     void setModelName(const String& name) { setModelName(name.c_str()); }
@@ -92,6 +92,7 @@ class SSDPClass{
     void setManufacturerURL(const char *url);
     void setHTTPPort(uint16_t port);
     void setTTL(uint8_t ttl);
+    void setInterval(uint32_t interval);
 
   protected:
     void _send(ssdp_method_t method);
@@ -104,6 +105,7 @@ class SSDPClass{
     SSDPTimer* _timer;
     uint16_t _port;
     uint8_t _ttl;
+    uint32_t _interval;
 
     IPAddress _respondToAddr;
     uint16_t  _respondToPort;

libraries/ESP8266WiFi/src/include/UdpContext.h

@@ -47,6 +47,7 @@ class UdpContext
     , _rx_buf(0)
     , _first_buf_taken(false)
     , _rx_buf_offset(0)
+    , _rx_buf_size(0)
     , _refcnt(0)
     , _tx_buf_head(0)
     , _tx_buf_cur(0)
@@ -74,6 +75,7 @@ class UdpContext
             pbuf_free(_rx_buf);
             _rx_buf = 0;
             _rx_buf_offset = 0;
+            _rx_buf_size = 0;
         }
     }
 
@@ -202,12 +204,36 @@ class UdpContext
         _on_rx = handler;
     }
 
+#ifdef DEBUG_ESP_CORE
+    // this helper is ready to be used when debugging UDP
+    void printChain (const pbuf* pb, const char* msg, size_t n) const
+    {
+        // printf the pb pbuf chain, bufferred and all at once
+        char buf[128];
+        int l = snprintf(buf, sizeof(buf), "UDP: %s %u: ", msg, n);
+        while (pb)
+        {
+            l += snprintf(&buf[l], sizeof(buf) -l, "%p(H=%d,%d<=%d)-",
+                pb, pb->flags == PBUF_HELPER_FLAG, pb->len, pb->tot_len);
+            pb = pb->next;
+        }
+        l += snprintf(&buf[l], sizeof(buf) - l, "(end)");
+        DEBUGV("%s\n", buf);
+    }
+#else
+    void printChain (const pbuf* pb, const char* msg) const
+    {
+        (void)pb;
+        (void)msg;
+    }
+#endif
+
     size_t getSize() const
     {
         if (!_rx_buf)
             return 0;
 
-        return _rx_buf->tot_len - _rx_buf_offset;
+        return _rx_buf_size - _rx_buf_offset;
     }
 
     size_t tell() const
@@ -222,7 +248,7 @@ class UdpContext
     }
 
     bool isValidOffset(const size_t pos) const {
-        return (pos <= _rx_buf->tot_len);
+        return (pos <= _rx_buf_size);
     }
 
     netif* getInputNetif() const
@@ -262,47 +288,54 @@ class UdpContext
             return true;
         }
 
+        // We have interleaved informations on addresses within received pbuf chain:
+        // (before ipv6 code we had: (data-pbuf) -> (data-pbuf) -> (data-pbuf) -> ... in the receiving order)
+        // Now:         (address-info-pbuf -> chained-data-pbuf [-> chained-data-pbuf...]) ->
+        //      (chained-address-info-pbuf -> chained-data-pbuf [-> chained...]) -> ...
+        // _rx_buf is currently adressing a data pbuf,
+        // in this function it is going to be discarded.
+
         auto deleteme = _rx_buf;
 
-        while(_rx_buf->len != _rx_buf->tot_len)
+        // forward in the chain until next address-info pbuf or end of chain
+        while(_rx_buf && _rx_buf->flags != PBUF_HELPER_FLAG)
             _rx_buf = _rx_buf->next;
 
-        _rx_buf = _rx_buf->next;
-
         if (_rx_buf)
         {
-            if (_rx_buf->flags == PBUF_HELPER_FLAG)
-            {
-                // we have interleaved informations on addresses within reception pbuf chain:
-                // before: (data-pbuf) -> (data-pbuf) -> (data-pbuf) -> ... in the receiving order
-                // now: (address-info-pbuf -> data-pbuf) -> (address-info-pbuf -> data-pbuf) -> ...
+            assert(_rx_buf->flags == PBUF_HELPER_FLAG);
 
-                // so the first rx_buf contains an address helper,
-                // copy it to "current address"
-                auto helper = (AddrHelper*)PBUF_ALIGNER(_rx_buf->payload);
-                _currentAddr = *helper;
+            // copy address helper to "current address"
+            auto helper = (AddrHelper*)PBUF_ALIGNER(_rx_buf->payload);
+            _currentAddr = *helper;
 
-                // destroy the helper in the about-to-be-released pbuf
-                helper->~AddrHelper();
+            // destroy the helper in the about-to-be-released pbuf
+            helper->~AddrHelper();
 
-                // forward in rx_buf list, next one is effective data
-                // current (not ref'ed) one will be pbuf_free'd with deleteme
-                _rx_buf = _rx_buf->next;
-            }
+            // forward in rx_buf list, next one is effective data
+            // current (not ref'ed) one will be pbuf_free'd
+            // with the 'deleteme' pointer above
+            _rx_buf = _rx_buf->next;
 
             // this rx_buf is not nullptr by construction,
+            assert(_rx_buf);
             // ref'ing it to prevent release from the below pbuf_free(deleteme)
+            // (ref counter prevents release and will be decreased by pbuf_free)
             pbuf_ref(_rx_buf);
         }
+
+        // release in chain previous data, and if any:
+        // current helper, but not start of current data
         pbuf_free(deleteme);
 
         _rx_buf_offset = 0;
+        _rx_buf_size = _processSize(_rx_buf);
         return _rx_buf != nullptr;
     }
 
     int read()
     {
-        if (!_rx_buf || _rx_buf_offset >= _rx_buf->tot_len)
+        if (!_rx_buf || _rx_buf_offset >= _rx_buf_size)
             return -1;
 
         char c = pbuf_get_at(_rx_buf, _rx_buf_offset);
@@ -315,9 +348,9 @@ class UdpContext
         if (!_rx_buf)
             return 0;
 
-        size_t max_size = _rx_buf->tot_len - _rx_buf_offset;
+        size_t max_size = _rx_buf_size - _rx_buf_offset;
         size = (size < max_size) ? size : max_size;
-        DEBUGV(":urd %d, %d, %d\r\n", size, _rx_buf->tot_len, _rx_buf_offset);
+        DEBUGV(":urd %d, %d, %d\r\n", size, _rx_buf_size, _rx_buf_offset);
 
         void* buf = pbuf_get_contiguous(_rx_buf, dst, size, size, _rx_buf_offset);
         if(!buf)
@@ -333,7 +366,7 @@ class UdpContext
 
     int peek() const
     {
-        if (!_rx_buf || _rx_buf_offset == _rx_buf->tot_len)
+        if (!_rx_buf || _rx_buf_offset == _rx_buf_size)
             return -1;
 
         return pbuf_get_at(_rx_buf, _rx_buf_offset);
@@ -345,7 +378,7 @@ class UdpContext
         if (!_rx_buf)
             return;
 
-        _consume(_rx_buf->tot_len - _rx_buf_offset);
+        _consume(_rx_buf_size - _rx_buf_offset);
     }
 
     size_t append(const char* data, size_t size)
@@ -429,6 +462,14 @@ class UdpContext
 
 private:
 
+    size_t _processSize (const pbuf* pb)
+    {
+        size_t ret = 0;
+        for (; pb && pb->flags != PBUF_HELPER_FLAG; pb = pb->next)
+            ret += pb->len;
+        return ret;
+    }
+
     void _reserve(size_t size)
     {
         const size_t pbuf_unit_size = 128;
@@ -466,8 +507,8 @@ class UdpContext
     void _consume(size_t size)
     {
         _rx_buf_offset += size;
-        if (_rx_buf_offset > _rx_buf->tot_len) {
-            _rx_buf_offset = _rx_buf->tot_len;
+        if (_rx_buf_offset > _rx_buf_size) {
+            _rx_buf_offset = _rx_buf_size;
         }
     }
 
@@ -476,6 +517,7 @@ class UdpContext
     {
         (void) upcb;
         // check receive pbuf chain depth
+        // optimization path: cache the pbuf chain length
         {
             pbuf* p;
             int count = 0;
@@ -488,6 +530,7 @@ class UdpContext
                 return;
             }
         }
+
 #if LWIP_VERSION_MAJOR == 1
     #define TEMPDSTADDR (&current_iphdr_dest)
     #define TEMPINPUTNETIF (current_netif)
@@ -541,6 +584,7 @@ class UdpContext
             _first_buf_taken = false;
             _rx_buf = pb;
             _rx_buf_offset = 0;
+            _rx_buf_size = pb->tot_len;
         }
 
         if (_on_rx) {
@@ -648,6 +692,7 @@ class UdpContext
     pbuf* _rx_buf;
     bool _first_buf_taken;
     size_t _rx_buf_offset;
+    size_t _rx_buf_size;
     int _refcnt;
     pbuf* _tx_buf_head;
     pbuf* _tx_buf_cur;

libraries/SoftwareSerial

@@ -13,5 +13,3 @@ glue and lwIP debug options are in builder/glue/gluedebug.h
 MSS values are in builder/Makefile.arduino
 
 MSS values in boards.txt are only informative
-
-current lwip2 submodule repository: https://github.com/d-a-v/esp82xx-nonos-linklayer/tree/arduino-2.4.1