Merge branch 'master' into master

Author: dok-net

cores/esp8266/Client.h

@@ -26,23 +26,27 @@
 class Client: public Stream {
 
     public:
-        virtual int connect(CONST IPAddress& ip, uint16_t port) =0;
+        virtual int connect(IPAddress ip, uint16_t port) =0;
         virtual int connect(const char *host, uint16_t port) =0;
         virtual size_t write(uint8_t) =0;
         virtual size_t write(const uint8_t *buf, size_t size) =0;
         virtual int available() = 0;
         virtual int read() = 0;
         virtual int read(uint8_t *buf, size_t size) = 0;
         virtual int peek() = 0;
-        virtual bool flush(unsigned int maxWaitMs = 0) = 0;
-        virtual bool stop(unsigned int maxWaitMs = 0) = 0;
+        virtual void flush() = 0;
+        virtual void stop() = 0;
         virtual uint8_t connected() = 0;
         virtual operator bool() = 0;
     protected:
-        CONST uint8_t* rawIPAddress(CONST IPAddress& addr) {
+        uint8_t* rawIPAddress(IPAddress& addr) {
             return addr.raw_address();
         }
-        ;
+#if LWIP_VERSION_MAJOR != 1
+        const uint8_t* rawIPAddress(const IPAddress& addr) {
+            return addr.raw_address();
+        }
+#endif
 };
 
 #endif

cores/esp8266/Udp.h

@@ -79,13 +79,18 @@ class UDP: public Stream {
         virtual void flush() =0;	// Finish reading the current packet
 
         // Return the IP address of the host who sent the current incoming packet
-        virtual IPAddress remoteIP() const =0;
+        virtual IPAddress remoteIP() =0;
         // Return the port of the host who sent the current incoming packet
-        virtual uint16_t remotePort() const =0;
+        virtual uint16_t remotePort() =0;
     protected:
-        CONST uint8_t* rawIPAddress(CONST IPAddress& addr) {
+        uint8_t* rawIPAddress(IPAddress& addr) {
             return addr.raw_address();
         }
+#if LWIP_VERSION_MAJOR != 1
+        const uint8_t* rawIPAddress(const IPAddress& addr) {
+            return addr.raw_address();
+        }
+#endif
 };
 
 #endif

libraries/ESP8266WiFi/examples/Udp/Udp.ino

@@ -26,7 +26,7 @@
 unsigned int localPort = 8888;      // local port to listen on
 
 // buffers for receiving and sending data
-char packetBuffer[UDP_TX_PACKET_MAX_SIZE]; //buffer to hold incoming packet,
+char packetBuffer[UDP_TX_PACKET_MAX_SIZE + 1]; //buffer to hold incoming packet,
 char  ReplyBuffer[] = "acknowledged\r\n";       // a string to send back
 
 WiFiUDP Udp;
@@ -49,21 +49,15 @@ void loop() {
   // if there's data available, read a packet
   int packetSize = Udp.parsePacket();
   if (packetSize) {
-    Serial.print("Received packet of size ");
-    Serial.println(packetSize);
-    Serial.print("From ");
-    IPAddress remote = Udp.remoteIP();
-    for (int i = 0; i < 4; i++) {
-      Serial.print(remote[i], DEC);
-      if (i < 3) {
-        Serial.print(".");
-      }
-    }
-    Serial.print(", port ");
-    Serial.println(Udp.remotePort());
+    Serial.printf("Received packet of size %d from %s:%d\n    (to %s:%d, free heap = %d B)\n",
+                  packetSize,
+                  Udp.remoteIP().toString().c_str(), Udp.remotePort(),
+                  Udp.destinationIP().toString().c_str(), Udp.localPort(),
+                  ESP.getFreeHeap());
 
     // read the packet into packetBufffer
-    Udp.read(packetBuffer, UDP_TX_PACKET_MAX_SIZE);
+    int n = Udp.read(packetBuffer, UDP_TX_PACKET_MAX_SIZE);
+    packetBuffer[n] = 0;
     Serial.println("Contents:");
     Serial.println(packetBuffer);
 
@@ -72,7 +66,7 @@ void loop() {
     Udp.write(ReplyBuffer);
     Udp.endPacket();
   }
-  delay(10);
+
 }
 
 /*

libraries/ESP8266WiFi/src/WiFiClient.cpp

@@ -137,7 +137,7 @@ int WiFiClient::connect(const String& host, uint16_t port)
     return connect(host.c_str(), port);
 }
 
-int WiFiClient::connect(CONST IPAddress& ip, uint16_t port)
+int WiFiClient::connect(IPAddress ip, uint16_t port)
 {
     if (_client) {
         stop();

libraries/ESP8266WiFi/src/WiFiClient.h

@@ -53,29 +53,31 @@ class WiFiClient : public Client, public SList<WiFiClient> {
   WiFiClient& operator=(const WiFiClient&);
 
   uint8_t status();
-  virtual int connect(CONST IPAddress& ip, uint16_t port);
-  virtual int connect(const char *host, uint16_t port);
+  virtual int connect(IPAddress ip, uint16_t port) override;
+  virtual int connect(const char *host, uint16_t port) override;
   virtual int connect(const String& host, uint16_t port);
-  virtual size_t write(uint8_t);
-  virtual size_t write(const uint8_t *buf, size_t size);
+  virtual size_t write(uint8_t) override;
+  virtual size_t write(const uint8_t *buf, size_t size) override;
   virtual size_t write_P(PGM_P buf, size_t size);
   size_t write(Stream& stream);
 
   // This one is deprecated, use write(Stream& instead)
   size_t write(Stream& stream, size_t unitSize) __attribute__ ((deprecated));
 
-  virtual int available();
-  virtual int read();
-  virtual int read(uint8_t *buf, size_t size);
-  virtual int peek();
+  virtual int available() override;
+  virtual int read() override;
+  virtual int read(uint8_t *buf, size_t size) override;
+  virtual int peek() override;
   virtual size_t peekBytes(uint8_t *buffer, size_t length);
   size_t peekBytes(char *buffer, size_t length) {
     return peekBytes((uint8_t *) buffer, length);
   }
-  virtual bool flush(unsigned int maxWaitMs = 0);
-  virtual bool stop(unsigned int maxWaitMs = 0);
-  virtual uint8_t connected();
-  virtual operator bool();
+  virtual void flush() override { (void)flush(0); }
+  virtual void stop() override { (void)stop(0); }
+  bool flush(unsigned int maxWaitMs);
+  bool stop(unsigned int maxWaitMs);
+  virtual uint8_t connected() override;
+  virtual operator bool() override;
 
   IPAddress remoteIP();
   uint16_t  remotePort();

libraries/ESP8266WiFi/src/WiFiClientSecureAxTLS.cpp

@@ -95,7 +95,7 @@ WiFiClientSecure::WiFiClientSecure(ClientContext* client, bool usePMEM,
     _ssl->connectServer(client, _timeout);
 }
 
-int WiFiClientSecure::connect(CONST IPAddress& ip, uint16_t port)
+int WiFiClientSecure::connect(IPAddress ip, uint16_t port)
 {
     if (!WiFiClient::connect(ip, port)) {
         return 0;

libraries/ESP8266WiFi/src/WiFiClientSecureAxTLS.h

@@ -35,7 +35,7 @@ class WiFiClientSecure : public WiFiClient {
   WiFiClientSecure() __attribute__((deprecated("Upgrade to BearSSL is advised, check https://github.com/esp8266/Arduino/blob/master/libraries/ESP8266WiFi/src/WiFiClientSecure.h#L25-L99")));
   ~WiFiClientSecure() override;
 
-  int connect(CONST IPAddress& ip, uint16_t port) override;
+  int connect(IPAddress ip, uint16_t port) override;
   int connect(const String& host, uint16_t port) override;
   int connect(const char* name, uint16_t port) override;
 
@@ -51,7 +51,8 @@ class WiFiClientSecure : public WiFiClient {
   int read() override;
   int peek() override;
   size_t peekBytes(uint8_t *buffer, size_t length) override;
-  bool stop(unsigned int maxWaitMs = 0) override;
+  void stop() override { (void)stop(0); }
+  bool stop(unsigned int maxWaitMs);
 
   bool setCACert(const uint8_t* pk, size_t size);
   bool setCertificate(const uint8_t* pk, size_t size);

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -210,7 +210,7 @@ bool WiFiClientSecure::flush(unsigned int maxWaitMs) {
   return WiFiClient::flush(maxWaitMs);
 }
 
-int WiFiClientSecure::connect(CONST IPAddress& ip, uint16_t port) {
+int WiFiClientSecure::connect(IPAddress ip, uint16_t port) {
   if (!WiFiClient::connect(ip, port)) {
     return 0;
   }

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h

@@ -37,7 +37,7 @@ class WiFiClientSecure : public WiFiClient {
     WiFiClientSecure(const WiFiClientSecure &rhs);
     ~WiFiClientSecure() override;
 
-    int connect(CONST IPAddress& ip, uint16_t port) override;
+    int connect(IPAddress ip, uint16_t port) override;
     int connect(const String& host, uint16_t port) override;
     int connect(const char* name, uint16_t port) override;
 
@@ -56,8 +56,10 @@ class WiFiClientSecure : public WiFiClient {
     int read() override;
     int peek() override;
     size_t peekBytes(uint8_t *buffer, size_t length) override;
-    bool flush(unsigned int maxWaitMs = 0) override;
-    bool stop(unsigned int maxWaitMs = 0) override;
+    bool flush(unsigned int maxWaitMs);
+    bool stop(unsigned int maxWaitMs);
+    void flush() override { (void)flush(0); }
+    void stop() override { (void)stop(0); }
 
     // Allow sessions to be saved/restored automatically to a memory area
     void setSession(Session *session) { _session = session; }

libraries/ESP8266WiFi/src/WiFiUdp.cpp

@@ -231,15 +231,15 @@ void WiFiUDP::flush()
     endPacket();
 }
 
-IPAddress WiFiUDP::remoteIP() const
+IPAddress WiFiUDP::remoteIP()
 {
     if (!_ctx)
         return INADDR_ANY;
 
     return _ctx->getRemoteAddress();
 }
 
-uint16_t WiFiUDP::remotePort() const
+uint16_t WiFiUDP::remotePort()
 {
     if (!_ctx)
         return 0;

libraries/ESP8266WiFi/src/WiFiUdp.h

@@ -95,9 +95,9 @@ class WiFiUDP : public UDP, public SList<WiFiUDP> {
   void flush() override;	// Finish reading the current packet
 
   // Return the IP address of the host who sent the current incoming packet
-  IPAddress remoteIP() const override;
+  IPAddress remoteIP() override;
   // Return the port of the host who sent the current incoming packet
-  uint16_t remotePort() const override;
+  uint16_t remotePort() override;
   // Return the destination address for incoming packets,
   // useful to distinguish multicast and ordinary packets
   IPAddress destinationIP() const;