Removed virtual + moved socketOptions ot read/write

Author: P-R-O-C-H-Y

libraries/WiFi/src/WiFiClient.cpp

@@ -310,22 +310,25 @@ int WiFiClient::setSocketOption(int option, char* value, size_t len)
     return res;
 }
 
-int WiFiClient::setTimeout(uint32_t seconds)
+void WiFiClient::setTimeout(uint32_t seconds)
 {
+    _lastReadTimeout = Client::getTimeout();
+    _lastWriteTimeout = _lastReadTimeout;
     Client::setTimeout(seconds * 1000); // This should be here?
     _timeout = seconds * 1000;
-    if(fd() >= 0) {
-        struct timeval tv;
-        tv.tv_sec = seconds;
-        tv.tv_usec = 0;
-        if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) < 0) {
-            return -1;
-        }
-        return setSocketOption(SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval));
-    }
-    else {
-        return 0;
-    }
+    
+    // if(fd() >= 0) {
+    //     struct timeval tv;
+    //     tv.tv_sec = seconds;
+    //     tv.tv_usec = 0;
+    //     if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) < 0) {
+    //         return -1;
+    //     }
+    //     return setSocketOption(SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval));
+    // }
+    // else {
+    //     return 0;
+    // }
 }
 
 int WiFiClient::setOption(int option, int *value)
@@ -400,6 +403,18 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size)
         tv.tv_usec = WIFI_CLIENT_SELECT_TIMEOUT_US;
         retry--;
 
+        if(_lastWriteTimeout != _timeout){
+            if(fd() >= 0){
+                struct timeval tv;
+                tv.tv_sec = _timeout/1000;
+                tv.tv_usec = 0;
+                if(setSocketOption(SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval)) >= 0)
+                {
+                    _lastWriteTimeout = _timeout;
+                }
+            }
+        }
+
         if(select(socketFileDescriptor + 1, NULL, &set, NULL, &tv) < 0) {
             return 0;
         }
@@ -459,6 +474,18 @@ size_t WiFiClient::write(Stream &stream)
 
 int WiFiClient::read(uint8_t *buf, size_t size)
 {
+    if(_lastReadTimeout != _timeout){
+        if(fd() >= 0){
+            struct timeval tv;
+            tv.tv_sec = _timeout/1000;
+            tv.tv_usec = 0;
+            if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) >= 0)
+            {
+                _lastReadTimeout = _timeout;
+            }
+        }
+    }
+
     int res = -1;
     if (_rxBuffer) {
         res = _rxBuffer->read(buf, size);

libraries/WiFi/src/WiFiClient.h

@@ -33,7 +33,6 @@ 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;
 };
 
 class WiFiClient : public ESPLwIPClient
@@ -43,6 +42,8 @@ class WiFiClient : public ESPLwIPClient
     std::shared_ptr<WiFiClientRxBuffer> _rxBuffer;
     bool _connected;
     int _timeout;
+    int _lastWriteTimeout;
+    int _lastReadTimeout;
 
 public:
     WiFiClient *next;
@@ -89,7 +90,7 @@ class WiFiClient : public ESPLwIPClient
     int setSocketOption(int option, char* value, size_t len);
     int setOption(int option, int *value);
     int getOption(int option, int *value);
-    int setTimeout(uint32_t seconds);
+    void setTimeout(uint32_t seconds);
     int setNoDelay(bool nodelay);
     bool getNoDelay();