wificlient can override setTimeout

Author: mcspr

libraries/ESP8266WiFi/src/WiFiClient.cpp

@@ -216,7 +216,6 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size)
     {
         return 0;
     }
-    _client->setTimeout(_timeout);
     return _client->write((const char*)buf, size);
 }
 
@@ -229,7 +228,6 @@ size_t WiFiClient::write(Stream& stream)
         return 0;
     }
     // core up to 2.7.4 was equivalent to this
-    _client->setTimeout(_timeout);
     return stream.sendAll(this);
 }
 
@@ -239,7 +237,6 @@ size_t WiFiClient::write_P(PGM_P buf, size_t size)
     {
         return 0;
     }
-    _client->setTimeout(_timeout);
     StreamConstPtr nopeek(buf, size);
     return nopeek.sendAll(this);
 }
@@ -267,13 +264,11 @@ int WiFiClient::read()
 
 int WiFiClient::read(uint8_t* buf, size_t size)
 {
-    _client->setTimeout(_timeout);
     return (int)_client->read((char*)buf, size);
 }
 
 int WiFiClient::read(char* buf, size_t size)
 {
-    _client->setTimeout(_timeout);
     return (int)_client->read(buf, size);
 }
 
@@ -282,7 +277,6 @@ int WiFiClient::peek()
     if (!available())
         return -1;
 
-    _client->setTimeout(_timeout);
     return _client->peek();
 }
 
@@ -304,7 +298,6 @@ size_t WiFiClient::peekBytes(uint8_t *buffer, size_t length) {
         count = length;
     }
 
-    _client->setTimeout(_timeout);
     return _client->peekBytes((char *)buffer, count);
 }
 
@@ -459,7 +452,6 @@ const char* WiFiClient::peekBuffer ()
 // return number of byte accessible by peekBuffer()
 size_t WiFiClient::peekAvailable ()
 {
-    _client->setTimeout(_timeout);
     return _client? _client->peekAvailable(): 0;
 }
 
@@ -469,3 +461,10 @@ void WiFiClient::peekConsume (size_t consume)
     if (_client)
         _client->peekConsume(consume);
 }
+
+void WiFiClient::setTimeout(uint16_t timeout) {
+    _timeout = timeout;
+    if (_client) {
+      _client->setTimeout(timeout);
+    }
+}

libraries/ESP8266WiFi/src/WiFiClient.h

@@ -96,6 +96,8 @@ class WiFiClient : public Client, public SList<WiFiClient> {
   virtual IPAddress localIP();
   virtual uint16_t  localPort();
 
+  void setTimeout(uint16_t);
+
   static void setLocalPortStart(uint16_t port) { _localPort = port; }
 
   int availableForWrite() override;