From 5564372cfc5fdd949d4ccee6693dc589d5b00a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 13:23:05 +0200 Subject: [PATCH 01/12] Removed virtual + moved socketOptions ot read/write --- libraries/WiFi/src/WiFiClient.cpp | 54 +++++++++++++++++++++++-------- libraries/WiFi/src/WiFiClient.h | 5 +-- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp index 91247d17386..f96258c3407 100644 --- a/libraries/WiFi/src/WiFiClient.cpp +++ b/libraries/WiFi/src/WiFiClient.cpp @@ -331,23 +331,25 @@ int WiFiClient::getSocketOption(int level, int option, const void* value, size_t 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) @@ -418,6 +420,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; } @@ -477,6 +491,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); diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h index cdb0e0539e9..d24fd4b2730 100644 --- a/libraries/WiFi/src/WiFiClient.h +++ b/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 _rxBuffer; bool _connected; int _timeout; + int _lastWriteTimeout; + int _lastReadTimeout; public: WiFiClient *next; @@ -91,7 +92,7 @@ class WiFiClient : public ESPLwIPClient int getSocketOption(int level, int option, const void* value, size_t size); 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(); From 12699ebcad6d98b34842fa2e0096b0b55355caa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 13:34:40 +0200 Subject: [PATCH 02/12] Removed no needed code + edit --- libraries/WiFi/src/WiFiClient.cpp | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp index f96258c3407..1a8f49bae39 100644 --- a/libraries/WiFi/src/WiFiClient.cpp +++ b/libraries/WiFi/src/WiFiClient.cpp @@ -335,21 +335,7 @@ 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; - // } } int WiFiClient::setOption(int option, int *value) @@ -422,10 +408,10 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size) 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) + struct timeval timeout_tv; + timeout_tv.tv_sec = _timeout/1000; + timeout_tv.tv_usec = 0; + if(setSocketOption(SO_SNDTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) { _lastWriteTimeout = _timeout; } @@ -493,10 +479,10 @@ 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) + struct timeval timeout_tv; + timeout_tv.tv_sec = _timeout/1000; + timeout_tv.tv_usec = 0; + if(setSocketOption(SO_RCVTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) { _lastReadTimeout = _timeout; } From c1183e443216ad4f22372108a3babf82790c6f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 13:43:03 +0200 Subject: [PATCH 03/12] removed Client::getTimeout --- libraries/WiFi/src/WiFiClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp index 1a8f49bae39..b42f486afb7 100644 --- a/libraries/WiFi/src/WiFiClient.cpp +++ b/libraries/WiFi/src/WiFiClient.cpp @@ -333,8 +333,8 @@ int WiFiClient::getSocketOption(int level, int option, const void* value, size_t void WiFiClient::setTimeout(uint32_t seconds) { - _lastReadTimeout = Client::getTimeout(); - _lastWriteTimeout = _lastReadTimeout; + _lastReadTimeout = _timeout; + _lastWriteTimeout = _timeout; _timeout = seconds * 1000; } From 2f49062b09b03ff925e1e13ef5bdf3a2eaa2b9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 14:55:17 +0200 Subject: [PATCH 04/12] removed setTimeout from WifiClient - read/write timeouts in constructor now --- libraries/WiFi/src/WiFiClient.cpp | 9 ++------- libraries/WiFi/src/WiFiClient.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp index b42f486afb7..aed24db30fc 100644 --- a/libraries/WiFi/src/WiFiClient.cpp +++ b/libraries/WiFi/src/WiFiClient.cpp @@ -211,6 +211,8 @@ void WiFiClient::stop() clientSocketHandle = NULL; _rxBuffer = NULL; _connected = false; + _lastReadTimeout = 0; + _lastWriteTimeout = 0; } int WiFiClient::connect(IPAddress ip, uint16_t port) @@ -331,13 +333,6 @@ int WiFiClient::getSocketOption(int level, int option, const void* value, size_t return res; } -void WiFiClient::setTimeout(uint32_t seconds) -{ - _lastReadTimeout = _timeout; - _lastWriteTimeout = _timeout; - _timeout = seconds * 1000; -} - int WiFiClient::setOption(int option, int *value) { return setSocketOption(IPPROTO_TCP, option, (const void*)value, sizeof(int)); diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h index d24fd4b2730..7ff753ef3e2 100644 --- a/libraries/WiFi/src/WiFiClient.h +++ b/libraries/WiFi/src/WiFiClient.h @@ -92,7 +92,6 @@ class WiFiClient : public ESPLwIPClient int getSocketOption(int level, int option, const void* value, size_t size); int setOption(int option, int *value); int getOption(int option, int *value); - void setTimeout(uint32_t seconds); int setNoDelay(bool nodelay); bool getNoDelay(); From e6e77ff719e404e95580aa00f6cb573c0b08c05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 15:01:33 +0200 Subject: [PATCH 05/12] Changed seconds to miliseconds in other classes relaed + examples --- libraries/HTTPClient/src/HTTPClient.cpp | 4 ++-- .../HTTPUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino | 2 +- libraries/WebServer/src/WebServer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp index 62a9c44901b..d5f9d721aee 100644 --- a/libraries/HTTPClient/src/HTTPClient.cpp +++ b/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->setTimeout(timeout + 500); /* / 1000 removed, WifiClient setTimeout changed to ms */ } } @@ -1165,7 +1165,7 @@ bool HTTPClient::connect(void) } // set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil() - _client->setTimeout((_tcpTimeout + 500) / 1000); + _client->setTimeout(_tcpTimeout + 500); /* / 1000 removed, WifiClient setTimeout changed to ms */ log_d(" connected to %s:%u", _host.c_str(), _port); diff --git a/libraries/HTTPUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino b/libraries/HTTPUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino index 2028d192c06..e528a9fdb1c 100644 --- a/libraries/HTTPUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino +++ b/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.setTimeout(12000); // timeout argument is defined in miliseconds for setTimeout // 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 diff --git a/libraries/WebServer/src/WebServer.cpp b/libraries/WebServer/src/WebServer.cpp index 8af04ac3f91..0d99f3680a1 100644 --- a/libraries/WebServer/src/WebServer.cpp +++ b/libraries/WebServer/src/WebServer.cpp @@ -303,7 +303,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); /* / 1000 removed, WifiClient setTimeout changed to ms */ _contentLength = CONTENT_LENGTH_NOT_SET; _handleRequest(); From b1193c2a460ca85fa24e0b689597bed850924d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 15:06:36 +0200 Subject: [PATCH 06/12] Applied same changes for WifiClientSecure --- .../WiFiClientSecure/src/WiFiClientSecure.cpp | 24 +++++++++++++++++++ .../WiFiClientSecure/src/WiFiClientSecure.h | 1 + 2 files changed, 25 insertions(+) diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp index 4d4702ba84d..9004412ea99 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp @@ -199,6 +199,16 @@ size_t WiFiClientSecure::write(const uint8_t *buf, size_t size) if (!_connected) { return 0; } + if(_lastWriteTimeout != _timeout){ + struct timeval timeout_tv; + timeout_tv.tv_sec = _timeout/1000; + timeout_tv.tv_usec = 0; + if(setSocketOption(SO_SNDTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) + { + _lastWriteTimeout = _timeout; + } + } + int res = send_ssl_data(sslclient, buf, size); if (res < 0) { stop(); @@ -209,6 +219,18 @@ size_t WiFiClientSecure::write(const uint8_t *buf, size_t size) int WiFiClientSecure::read(uint8_t *buf, size_t size) { + if(_lastReadTimeout != _timeout){ + if(fd() >= 0){ + struct timeval timeout_tv; + timeout_tv.tv_sec = _timeout/1000; + timeout_tv.tv_usec = 0; + if(setSocketOption(SO_RCVTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) + { + _lastReadTimeout = _timeout; + } + } + } + int peeked = 0; int avail = available(); if ((!buf && size) || avail <= 0) { @@ -393,6 +415,8 @@ int WiFiClientSecure::setTimeout(uint32_t seconds) } int WiFiClientSecure::fd() const + +int WiFiClientSecure::setSocketOption(int option, char* value, size_t len) { return sslclient->socket; } diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.h b/libraries/WiFiClientSecure/src/WiFiClientSecure.h index 6c967fbd0e6..595e1ed3899 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.h +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.h @@ -82,6 +82,7 @@ class WiFiClientSecure : public WiFiClient bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); }; int setTimeout(uint32_t seconds); int fd() const; + int setSocketOption(int option, char* value, size_t len); operator bool() { From 6420e3a5d13377e067c717237f0862269e9fe792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 15:10:37 +0200 Subject: [PATCH 07/12] Added 0 init values to constructor --- libraries/WiFiClientSecure/src/WiFiClientSecure.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp index 9004412ea99..a1b67cd2fdd 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp @@ -54,6 +54,8 @@ WiFiClientSecure::WiFiClientSecure(int sock) { _connected = false; _timeout = 30000; // Same default as ssl_client + _lastReadTimeout = 0; + _lastWriteTimeout = 0; sslclient = new sslclient_context; ssl_init(sslclient); @@ -94,6 +96,8 @@ void WiFiClientSecure::stop() sslclient->socket = -1; _connected = false; _peek = -1; + _lastReadTimeout = 0; + _lastWriteTimeout = 0; } stop_ssl_socket(sslclient, _CA_cert, _cert, _private_key); } From bee59c13c5333023a436eae647a8f4e77b38b1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 15:30:11 +0200 Subject: [PATCH 08/12] Seconds are not rounded now --- libraries/WiFi/src/WiFiClient.cpp | 8 ++++---- libraries/WiFiClientSecure/src/WiFiClientSecure.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp index aed24db30fc..52c73b67300 100644 --- a/libraries/WiFi/src/WiFiClient.cpp +++ b/libraries/WiFi/src/WiFiClient.cpp @@ -404,8 +404,8 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size) if(_lastWriteTimeout != _timeout){ if(fd() >= 0){ struct timeval timeout_tv; - timeout_tv.tv_sec = _timeout/1000; - timeout_tv.tv_usec = 0; + timeout_tv.tv_sec = _timeout / 1000; + timeout_tv.tv_usec = (_timeout % 1000) * 1000; if(setSocketOption(SO_SNDTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) { _lastWriteTimeout = _timeout; @@ -475,8 +475,8 @@ int WiFiClient::read(uint8_t *buf, size_t size) if(_lastReadTimeout != _timeout){ if(fd() >= 0){ struct timeval timeout_tv; - timeout_tv.tv_sec = _timeout/1000; - timeout_tv.tv_usec = 0; + timeout_tv.tv_sec = _timeout / 1000; + timeout_tv.tv_usec = (_timeout % 1000) * 1000; if(setSocketOption(SO_RCVTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) { _lastReadTimeout = _timeout; diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp index a1b67cd2fdd..8ad640b2620 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp @@ -205,8 +205,8 @@ size_t WiFiClientSecure::write(const uint8_t *buf, size_t size) } if(_lastWriteTimeout != _timeout){ struct timeval timeout_tv; - timeout_tv.tv_sec = _timeout/1000; - timeout_tv.tv_usec = 0; + timeout_tv.tv_sec = _timeout / 1000; + timeout_tv.tv_usec = (_timeout % 1000) * 1000; if(setSocketOption(SO_SNDTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) { _lastWriteTimeout = _timeout; @@ -226,8 +226,8 @@ int WiFiClientSecure::read(uint8_t *buf, size_t size) if(_lastReadTimeout != _timeout){ if(fd() >= 0){ struct timeval timeout_tv; - timeout_tv.tv_sec = _timeout/1000; - timeout_tv.tv_usec = 0; + timeout_tv.tv_sec = _timeout / 1000; + timeout_tv.tv_usec = (_timeout % 1000) * 1000; if(setSocketOption(SO_RCVTIMEO, (char *)&timeout_tv, sizeof(struct timeval)) >= 0) { _lastReadTimeout = _timeout; From b986041accad61d743ff068f32b4066193cfc8bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Procha=CC=81zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 2 May 2022 16:40:28 +0200 Subject: [PATCH 09/12] removed +500 for previous rounding + unnecessary comments removed. --- libraries/HTTPClient/src/HTTPClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp index d5f9d721aee..1733d0cede1 100644 --- a/libraries/HTTPClient/src/HTTPClient.cpp +++ b/libraries/HTTPClient/src/HTTPClient.cpp @@ -495,7 +495,7 @@ void HTTPClient::setTimeout(uint16_t timeout) { _tcpTimeout = timeout; if(connected()) { - _client->setTimeout(timeout + 500); /* / 1000 removed, WifiClient setTimeout changed to ms */ + _client->setTimeout(timeout); } } @@ -1165,7 +1165,7 @@ bool HTTPClient::connect(void) } // set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil() - _client->setTimeout(_tcpTimeout + 500); /* / 1000 removed, WifiClient setTimeout changed to ms */ + _client->setTimeout(_tcpTimeout); log_d(" connected to %s:%u", _host.c_str(), _port); From 77830cfd1e7d3223340651082ee7162dc5bf4ec8 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Wed, 13 Dec 2023 12:41:13 +0100 Subject: [PATCH 10/12] fix rebased code in WifiClientSecure --- libraries/WiFiClientSecure/src/WiFiClientSecure.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp index 8ad640b2620..bfb3dde437c 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp @@ -419,6 +419,9 @@ int WiFiClientSecure::setTimeout(uint32_t seconds) } int WiFiClientSecure::fd() const +{ + return sslclient->socket; +} int WiFiClientSecure::setSocketOption(int option, char* value, size_t len) { From 7d86e1d532c8e80ed4aa9ad7fe2efccadc3f5903 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Wed, 13 Dec 2023 12:42:58 +0100 Subject: [PATCH 11/12] Fix rebased code --- libraries/WiFiClientSecure/src/WiFiClientSecure.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp index bfb3dde437c..b3c64129d75 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp @@ -422,9 +422,3 @@ int WiFiClientSecure::fd() const { return sslclient->socket; } - -int WiFiClientSecure::setSocketOption(int option, char* value, size_t len) -{ - return sslclient->socket; -} - From 0e1d13a1655949c3c779c4b948dd3c2040be6b6e Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Wed, 13 Dec 2023 12:47:53 +0100 Subject: [PATCH 12/12] Fix rebase code --- libraries/WiFiClientSecure/src/WiFiClientSecure.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.h b/libraries/WiFiClientSecure/src/WiFiClientSecure.h index 595e1ed3899..6c967fbd0e6 100644 --- a/libraries/WiFiClientSecure/src/WiFiClientSecure.h +++ b/libraries/WiFiClientSecure/src/WiFiClientSecure.h @@ -82,7 +82,6 @@ class WiFiClientSecure : public WiFiClient bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); }; int setTimeout(uint32_t seconds); int fd() const; - int setSocketOption(int option, char* value, size_t len); operator bool() {