Merge branch 'master' into SDFS

Author: earlephilhower

.travis.yml

@@ -65,6 +65,17 @@ jobs:
       env:
         - BUILD_PARITY=odd
 
+    - name: "Build lwIP-v1.4 (1)"
+      stage: build
+      script: $TRAVIS_BUILD_DIR/tests/build1.sh
+      env:
+        - BUILD_PARITY=even
+    - name: "Build lwIP-v1.4 (2)"
+      stage: build
+      script: $TRAVIS_BUILD_DIR/tests/build1.sh
+      env:
+        - BUILD_PARITY=odd
+
     - name: "Host tests"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh

cores/esp8266/IPAddress.h

@@ -35,9 +35,12 @@
 #define IP_IS_V4_VAL(x) (1)
 #define IP_SET_TYPE_VAL(x,y) do { (void)0; } while (0)
 #define IP_ANY_TYPE (&ip_addr_any)
+#define IP4_ADDR_ANY IPADDR_ANY
 #define IP4_ADDR_ANY4 IPADDR_ANY
 #define IPADDR4_INIT(x) { x }
 #define CONST /* nothing: lwIP-v1 does not use const */
+#define ip4_addr_netcmp ip_addr_netcmp
+#define netif_dhcp_data(netif) ((netif)->dhcp)
 #else // lwIP-v2+
 #define CONST const
 #if !LWIP_IPV6
@@ -84,13 +87,15 @@ class IPAddress: public Printable {
 
         // Overloaded cast operator to allow IPAddress objects to be used where a pointer
         // to a four-byte uint8_t array is expected
-        operator uint32_t() const {
-            return isV4()? v4(): (uint32_t)0;
-        }
+        operator uint32_t() const { return isV4()? v4(): (uint32_t)0; }
+        operator uint32_t()       { return isV4()? v4(): (uint32_t)0; }
+        operator u32_t()    const { return isV4()? v4():    (u32_t)0; }
+        operator u32_t()          { return isV4()? v4():    (u32_t)0; }
 
-        // the above uint32_t() cast can be ambiguous
-        // if gcc complains, use instead isSet() or v4() according to what's relevant
         bool isSet () const;
+        operator bool () const { return isSet(); } // <-
+        operator bool ()       { return isSet(); } // <- both are needed
+
         // generic IPv4 wrapper to uint32-view like arduino loves to see it
         const u32_t& v4() const { return ip_2_ip4(&_ip)->addr; } // for raw_address(const)
               u32_t& v4()       { return ip_2_ip4(&_ip)->addr; }
@@ -115,6 +120,10 @@ class IPAddress: public Printable {
         }
         bool operator==(const uint8_t* addr) const;
 
+        int operator>>(int n) const {
+            return isV4()? v4() >> n: 0;
+        }
+
         // Overloaded index operator to allow getting and setting individual octets of the address
         uint8_t operator[](int index) const {
             return isV4()? *(raw_address() + index): 0;
@@ -152,6 +161,9 @@ class IPAddress: public Printable {
         IPAddress(const ipv4_addr& fw_addr)   { setV4(); v4() = fw_addr.addr; }
         IPAddress(const ipv4_addr* fw_addr)   { setV4(); v4() = fw_addr->addr; }
 
+        IPAddress& operator=(const ipv4_addr& fw_addr)   { setV4(); v4() = fw_addr.addr;  return *this; }
+        IPAddress& operator=(const ipv4_addr* fw_addr)   { setV4(); v4() = fw_addr->addr; return *this; }
+
         operator       ip_addr_t () const { return  _ip; }
         operator const ip_addr_t*() const { return &_ip; }
         operator       ip_addr_t*()       { return &_ip; }
@@ -166,6 +178,9 @@ class IPAddress: public Printable {
         IPAddress(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); }
         IPAddress(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); }
 
+        IPAddress& operator=(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); return *this; }
+        IPAddress& operator=(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); return *this; }
+
         uint16_t* raw6()
         {
             setV6();

libraries/ESP8266NetBIOS/ESP8266NetBIOS.cpp

@@ -182,7 +182,7 @@ void ESP8266NetBIOS::_recv(udp_pcb *upcb, pbuf *pb, CONST ip_addr_t *addr, uint1
         size_t len = pb->len;
 #if LWIP_VERSION_MAJOR == 1
         // check UdpContext.h
-        const ip_addr_t* saddr = &current_iphdr_src;
+        ip_addr_t* saddr = &current_iphdr_src;
 #else
         // check UdpContext.h
         const ip_addr_t* saddr = &ip_data.current_iphdr_src;

libraries/ESP8266WiFi/examples/StaticLease/StaticLease.ino

@@ -1,3 +1,18 @@
+
+#include <lwip/init.h>
+
+#if LWIP_VERSION_MAJOR == 1
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("wifi_softap_add_dhcps_lease() is not implemented with lwIP-v1");
+}
+
+void loop() {
+}
+
+#else
+
 /* Create a WiFi access point and provide static lease */
 
 #include <ESP8266WiFi.h>
@@ -19,9 +34,7 @@ void handleRoot() {
   char wifiClientMac[18];
   unsigned char number_client;
   struct station_info *stat_info;
-  struct ip4_addr *IPaddress;
 
-  IPAddress address;
   int i = 1;
 
   number_client = wifi_softap_get_station_num();
@@ -31,13 +44,11 @@ void handleRoot() {
   result += String(number_client);
   result += "</h1></br>";
   while (stat_info != NULL) {
-    IPaddress = &stat_info->ip;
-    address = IPaddress->addr;
 
     result += "Client ";
     result += String(i);
     result += " = ";
-    result += String(address.toString());
+    result += IPAddress(stat_info->ip).toString();
     result += " - ";
     sprintf(wifiClientMac, "%02X:%02X:%02X:%02X:%02X:%02X", MAC2STR(stat_info->bssid));
     result += wifiClientMac;
@@ -93,3 +104,5 @@ void setup() {
 void loop() {
   server.handleClient();
 }
+
+#endif // lwIP-v2

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp

@@ -534,7 +534,11 @@ bool ESP8266WiFiSTAClass::hostname(const char* aHostname) {
     for (netif* intf = netif_list; intf; intf = intf->next) {
 
         // unconditionally update all known interfaces
+#if LWIP_VERSION_MAJOR == 1
+        intf->hostname = (char*)wifi_station_get_hostname();
+#else
         intf->hostname = wifi_station_get_hostname();
+#endif
 
         if (netif_dhcp_data(intf) != nullptr) {
             // renew already started DHCP leases

libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.cpp

@@ -76,29 +76,30 @@ void WiFiServerSecure::setECCert(const X509List *chain, unsigned cert_issuer_key
 // Return a client if there's an available connection waiting.  If one is returned,
 // then any validation (i.e. client cert checking) will have succeeded.
 WiFiClientSecure WiFiServerSecure::available(uint8_t* status) {
+  WiFiClientSecure client;
+
   (void) status; // Unused
   if (_unclaimed) {
     if (_sk && _sk->isRSA()) {
       WiFiClientSecure result(_unclaimed, _chain, _sk, _iobuf_in_size, _iobuf_out_size, _client_CA_ta);
       _unclaimed = _unclaimed->next();
       result.setNoDelay(_noDelay);
       DEBUGV("WS:av\r\n");
-      return result;
+      client = result;
     } else if (_sk && _sk->isEC()) {
       WiFiClientSecure result(_unclaimed, _chain, _cert_issuer_key_type, _sk, _iobuf_in_size, _iobuf_out_size, _client_CA_ta);
       _unclaimed = _unclaimed->next();
       result.setNoDelay(_noDelay);
       DEBUGV("WS:av\r\n");
-      return result;
+      client = result;
     } else {
       // No key was defined, so we can't actually accept and attempt accept() and SSL handshake.
       DEBUGV("WS:nokey\r\n");
     }
+  } else {
+    optimistic_yield(1000);
   }
-
-  // Something weird, return a no-op object
-  optimistic_yield(1000);
-  return WiFiClientSecure();
+  return client;
 }
 
 

libraries/ESP8266mDNS/src/LEAmDNS.cpp

@@ -22,8 +22,11 @@
  *
  */
 
+#include <Schedule.h>
+
 #include "LEAmDNS_Priv.h"
 
+
 namespace esp8266 {
 
 /*
@@ -87,28 +90,30 @@ MDNSResponder::~MDNSResponder(void) {
  */
 bool MDNSResponder::begin(const char* p_pcHostname) {
 
-    bool    bResult = (0 != m_pcHostname);
+    bool    bResult = false;
 
-    if (0 == m_pcHostname) {
+    if (0 == m_pUDPContext) {
         if (_setHostname(p_pcHostname)) {
 
             m_GotIPHandler = WiFi.onStationModeGotIP([this](const WiFiEventStationModeGotIP& pEvent) {
                 (void) pEvent;
-                _restart();
+                // Ensure that _restart() runs in USER context
+                schedule_function(std::bind(&MDNSResponder::_restart, this));
             });
 
             m_DisconnectedHandler = WiFi.onStationModeDisconnected([this](const WiFiEventStationModeDisconnected& pEvent) {
                 (void) pEvent;
-                _restart();
+                // Ensure that _restart() runs in USER context
+                schedule_function(std::bind(&MDNSResponder::_restart, this));
             });
 
             bResult = _restart();
         }
+        DEBUG_EX_ERR(if (!bResult) { DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] begin: FAILED for '%s'!\n"), (p_pcHostname ?: "-")); } );
     }
     else {
-        DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] begin: Ignoring multiple calls (Ignored host domain: '%s')!\n"), (p_pcHostname ?: "-")););
+        DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] begin: Ignoring multiple calls to begin (Ignored host domain: '%s')!\n"), (p_pcHostname ?: "-")););
     }
-    DEBUG_EX_ERR(if (!bResult) { DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] begin: FAILED for '%s'!\n"), (p_pcHostname ?: "-")); } );
     return bResult;
 }
 

libraries/ESP8266mDNS/src/LEAmDNS_lwIPdefs.h

@@ -32,7 +32,7 @@
 
 // cherry pick from lwip1 dns.c/mdns.c source files:
 #define DNS_MQUERY_PORT            5353
-#define DNS_MQUERY_IPV4_GROUP_INIT ipaddr_addr("224.0.0.251") /* resolver1.opendns.com */
+#define DNS_MQUERY_IPV4_GROUP_INIT IPAddress(224,0,0,251)     /* resolver1.opendns.com */
 #define DNS_RRCLASS_ANY            255                        /* any class */
 
 #else // lwIP > 1

tests/build1.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+cache_dir=$(mktemp -d)
+
+source "$TRAVIS_BUILD_DIR"/tests/common.sh
+
+if [ -z "$BUILD_PARITY" ]; then
+    mod=1
+    rem=0
+elif [ "$BUILD_PARITY" = "even" ]; then
+    mod=2
+    rem=0
+elif [ "$BUILD_PARITY" = "odd" ]; then
+    mod=2
+    rem=1
+fi
+
+install_arduino nodebug
+build_sketches_with_arduino "$mod" "$rem" hb1
+
+rm -rf "$cache_dir"
+

tests/host/Makefile

@@ -87,6 +87,7 @@ MOCK_CPP_FILES_COMMON := $(addprefix common/,\
 	WMath.cpp \
 	MockSerial.cpp \
 	MockTools.cpp \
+	MocklwIP.cpp \
 )
 
 MOCK_CPP_FILES := $(MOCK_CPP_FILES_COMMON) $(addprefix common/,\