arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

WiFiClientSecure::available fix

Browse Source 
Attempt to read data from SSL engine inside WiFiClientSecure::available() if RX buffer is empty.
Fix #784.
This commit is contained in:
Ivan Grokhotkov 2015-09-16 16:24:52 +03:00
parent c528a44f1a
commit 5387b2286e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
View File

@ -50,6 +50,8 @@ extern "C"
#define SSL_DEBUG_OPTS 0 #define SSL_DEBUG_OPTS 0
#endif #endif
#define SSL_RX_BUF_SIZE 1536
class SSLContext { class SSLContext {
public: public:
SSLContext() { SSLContext() {
@ -58,7 +60,7 @@ public:
} }
++_ssl_ctx_refcnt; ++_ssl_ctx_refcnt;
_rxbuf = new cbuf(1536); _rxbuf = new cbuf(SSL_RX_BUF_SIZE);
} }
~SSLContext() { ~SSLContext() {
@ -112,8 +114,14 @@ public:
} }
int available() { int available() {
optimistic_yield(100); auto rc = _rxbuf->getSize();
return _rxbuf->getSize(); if (rc == 0) {
_readAll();
rc = _rxbuf->getSize();
} else {
optimistic_yield(100);
}
return rc;
} }
operator SSL*() { operator SSL*() {
@ -297,7 +305,7 @@ extern "C" int ax_port_read(int fd, uint8_t* buffer, size_t count) {
errno = EAGAIN; errno = EAGAIN;
} }
if (cb == 0) { if (cb == 0) {
yield(); optimistic_yield(100);
return -1; return -1;
} }
return cb; return cb;