Skip to content

Commit 394f721

Browse files
authored
fix set/getSocketOption inheritance (#7480)
1 parent 05e55d8 commit 394f721

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

Diff for: libraries/WiFi/src/WiFiClient.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class WiFiClient : public ESPLwIPClient
8484
return !this->operator==(rhs);
8585
};
8686

87-
int fd() const;
87+
virtual int fd() const;
8888

8989
int setSocketOption(int option, char* value, size_t len);
9090
int setSocketOption(int level, int option, const void* value, size_t len);

Diff for: libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

+3-10
Original file line numberDiff line numberDiff line change
@@ -376,16 +376,9 @@ int WiFiClientSecure::setTimeout(uint32_t seconds)
376376
return 0;
377377
}
378378
}
379-
int WiFiClientSecure::setSocketOption(int option, char* value, size_t len)
380-
{
381-
return setSocketOption(SOL_SOCKET, option, (const void*)value, len);
382-
}
383379

384-
int WiFiClientSecure::setSocketOption(int level, int option, const void* value, size_t len)
380+
int WiFiClientSecure::fd() const
385381
{
386-
int res = setsockopt(sslclient->socket, level, option, value, len);
387-
if(res < 0) {
388-
log_e("fail on %d, errno: %d, \"%s\"", sslclient->socket, errno, strerror(errno));
389-
}
390-
return res;
382+
return sslclient->socket;
391383
}
384+

Diff for: libraries/WiFiClientSecure/src/WiFiClientSecure.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ class WiFiClientSecure : public WiFiClient
8080
const mbedtls_x509_crt* getPeerCertificate() { return mbedtls_ssl_get_peer_cert(&sslclient->ssl_ctx); };
8181
bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); };
8282
int setTimeout(uint32_t seconds);
83-
int setSocketOption(int option, char* value, size_t len);
84-
int setSocketOption(int level, int option, const void* value, size_t len);
83+
int fd() const;
8584

8685
operator bool()
8786
{

0 commit comments

Comments
 (0)