WiFiClients - setTimeout replaced with setConnectionTimeout

to not shadow Stream::setTimeout which has a different purpose

Author: JAndrassy

libraries/HTTPClient/src/HTTPClient.cpp

@@ -495,7 +495,7 @@ void HTTPClient::setTimeout(uint16_t timeout)
 {
     _tcpTimeout = timeout;
     if(connected()) {
-        _client->setTimeout((timeout + 500) / 1000);
+        _client->setConnectionTimeout(timeout + 500);
     }
 }
 
@@ -1165,7 +1165,8 @@ bool HTTPClient::connect(void)
     }
 
     // set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil()
-    _client->setTimeout((_tcpTimeout + 500) / 1000);	
+    _client->setConnectionTimeout(_tcpTimeout + 500);
+    _client->setTimeout(_tcpTimeout + 500);
 
     log_d(" connected to %s:%u", _host.c_str(), _port);
 

libraries/HTTPUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino

@@ -96,7 +96,7 @@ void loop() {
     client.setCACert(rootCACertificate);
 
     // Reading data over SSL may be slow, use an adequate timeout
-    client.setTimeout(12000 / 1000); // timeout argument is defined in seconds for setTimeout
+    client.setConnectionTimeout(12000);
 
     // The line below is optional. It can be used to blink the LED on the board during flashing
     // The LED will be on during download of one buffer of data from the network. The LED will

libraries/WebServer/src/WebServer.cpp

@@ -302,7 +302,7 @@ void WebServer::handleClient() {
         if (_parseRequest(_currentClient)) {
           // because HTTP_MAX_SEND_WAIT is expressed in milliseconds,
           // it must be divided by 1000
-          _currentClient.setTimeout(HTTP_MAX_SEND_WAIT / 1000);
+          _currentClient.setTimeout(HTTP_MAX_SEND_WAIT);
           _contentLength = CONTENT_LENGTH_NOT_SET;
           _handleRequest();
 

libraries/WiFi/src/WiFiClient.cpp

@@ -322,14 +322,13 @@ int WiFiClient::setSocketOption(int level, int option, const void* value, size_t
     return res;
 }
 
-int WiFiClient::setTimeout(uint32_t seconds)
+int WiFiClient::setConnectionTimeout(uint32_t milliseconds)
 {
-    Client::setTimeout(seconds * 1000); // This should be here?
-    _timeout = seconds * 1000;
+    _timeout = milliseconds;
     if(fd() >= 0) {
         struct timeval tv;
-        tv.tv_sec = seconds;
-        tv.tv_usec = 0;
+        tv.tv_sec = _timeout / 1000;
+        tv.tv_usec = (_timeout  % 1000) * 1000;
         if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) < 0) {
             return -1;
         }

libraries/WiFi/src/WiFiClient.h

@@ -33,7 +33,7 @@ class ESPLwIPClient : public Client
 public:
         virtual int connect(IPAddress ip, uint16_t port, int32_t timeout) = 0;
         virtual int connect(const char *host, uint16_t port, int32_t timeout) = 0;
-        virtual int setTimeout(uint32_t seconds) = 0;
+        virtual int setConnectionTimeout(uint32_t milliseconds) = 0;
 };
 
 class WiFiClient : public ESPLwIPClient
@@ -42,7 +42,7 @@ class WiFiClient : public ESPLwIPClient
     std::shared_ptr<WiFiClientSocketHandle> clientSocketHandle;
     std::shared_ptr<WiFiClientRxBuffer> _rxBuffer;
     bool _connected;
-    int _timeout;
+    uint32_t _timeout;
 
 public:
     WiFiClient *next;
@@ -90,7 +90,7 @@ class WiFiClient : public ESPLwIPClient
     int setSocketOption(int level, int option, const void* value, size_t len);
     int setOption(int option, int *value);
     int getOption(int option, int *value);
-    int setTimeout(uint32_t seconds);
+    int setConnectionTimeout(uint32_t milliseconds);
     int setNoDelay(bool nodelay);
     bool getNoDelay();
 

libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

@@ -375,13 +375,13 @@ void WiFiClientSecure::setAlpnProtocols(const char **alpn_protos)
 {
     _alpn_protos = alpn_protos;
 }
-int WiFiClientSecure::setTimeout(uint32_t seconds)
+int WiFiClientSecure::setConnectionTimeout(uint32_t milliseconds)
 {
-    _timeout = seconds * 1000;
+    _timeout = milliseconds;
     if (sslclient->socket >= 0) {
         struct timeval tv;
-        tv.tv_sec = seconds;
-        tv.tv_usec = 0;
+        tv.tv_sec = _timeout / 1000;
+        tv.tv_usec = (_timeout  % 1000) * 1000;
         if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) < 0) {
             return -1;
         }

libraries/WiFiClientSecure/src/WiFiClientSecure.h

@@ -80,7 +80,7 @@ class WiFiClientSecure : public WiFiClient
     void setAlpnProtocols(const char **alpn_protos);
     const mbedtls_x509_crt* getPeerCertificate() { return mbedtls_ssl_get_peer_cert(&sslclient->ssl_ctx); };
     bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); };
-    int setTimeout(uint32_t seconds);
+    int setConnectionTimeout(uint32_t milliseconds);
     int fd() const;
 
     operator bool()