adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix set/getSocketOption inheritance (#7480)

Browse source
This commit is contained in:
Bert Melis 2022-12-08 03:20:01 +01:00 committed by GitHub
parent 05e55d8716
commit 394f7218ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/WiFi/src/WiFiClient.h
View file

@ -84,7 +84,7 @@ public:
return !this->operator==(rhs); return !this->operator==(rhs);
}; };
int fd() const; virtual int fd() const;
int setSocketOption(int option, char* value, size_t len); int setSocketOption(int option, char* value, size_t len);
int setSocketOption(int level, int option, const void* value, size_t len); int setSocketOption(int level, int option, const void* value, size_t len);

13
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
View file

@ -376,16 +376,9 @@ int WiFiClientSecure::setTimeout(uint32_t seconds)
return 0; return 0;
} }
} }
int WiFiClientSecure::setSocketOption(int option, char* value, size_t len)
int WiFiClientSecure::fd() const
{ {
return setSocketOption(SOL_SOCKET, option, (const void*)value, len); return sslclient->socket;
} }
int WiFiClientSecure::setSocketOption(int level, int option, const void* value, size_t len)
{
int res = setsockopt(sslclient->socket, level, option, value, len);
if(res < 0) {
log_e("fail on %d, errno: %d, \"%s\"", sslclient->socket, errno, strerror(errno));
}
return res;
}

3
libraries/WiFiClientSecure/src/WiFiClientSecure.h
View file

@ -80,8 +80,7 @@ public:
const mbedtls_x509_crt* getPeerCertificate() { return mbedtls_ssl_get_peer_cert(&sslclient->ssl_ctx); }; 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); }; bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); };
int setTimeout(uint32_t seconds); int setTimeout(uint32_t seconds);
int setSocketOption(int option, char* value, size_t len); int fd() const;
int setSocketOption(int level, int option, const void* value, size_t len);
operator bool() operator bool()
{ {