mirror of https://github.com/arendst/Tasmota.git
Merge pull request #13435 from Leo-PL/fix_bearssl_connect_esp32
BearSSL: support connect() without timeout on ESP32
This commit is contained in:
commit
e6cc6dfcd1
lib/lib_ssl/tls_mini/src
|
@ -303,7 +303,7 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout
|
|||
}
|
||||
return _connectSSL(nullptr);
|
||||
}
|
||||
#else // ESP32
|
||||
#endif // ESP32
|
||||
int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) {
|
||||
DEBUG_BSSL("connect(%s,%d)", ip.toString().c_str(), port);
|
||||
clearLastError();
|
||||
|
@ -313,7 +313,6 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) {
|
|||
}
|
||||
return _connectSSL(nullptr);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef ESP32
|
||||
int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t timeout) {
|
||||
|
@ -334,7 +333,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t tim
|
|||
LOG_HEAP_SIZE("Before calling _connectSSL");
|
||||
return _connectSSL(name);
|
||||
}
|
||||
#else // ESP32
|
||||
#endif // ESP32
|
||||
int WiFiClientSecure_light::connect(const char* name, uint16_t port) {
|
||||
DEBUG_BSSL("connect(%s,%d)\n", name, port);
|
||||
IPAddress remote_addr;
|
||||
|
@ -353,7 +352,6 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port) {
|
|||
LOG_HEAP_SIZE("Before calling _connectSSL");
|
||||
return _connectSSL(name);
|
||||
}
|
||||
#endif
|
||||
|
||||
void WiFiClientSecure_light::_freeSSL() {
|
||||
_ctx_present = false;
|
||||
|
|
|
@ -41,10 +41,9 @@ class WiFiClientSecure_light : public WiFiClient {
|
|||
#ifdef ESP32 // the method to override in ESP32 has timeout argument
|
||||
int connect(IPAddress ip, uint16_t port, int32_t timeout) override;
|
||||
int connect(const char* name, uint16_t port, int32_t timeout) override;
|
||||
#else
|
||||
#endif
|
||||
int connect(IPAddress ip, uint16_t port) override;
|
||||
int connect(const char* name, uint16_t port) override;
|
||||
#endif
|
||||
|
||||
uint8_t connected() override;
|
||||
size_t write(const uint8_t *buf, size_t size) override;
|
||||
|
|
Loading…
Reference in New Issue