ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9309 from VeijoPesonen/bugfix-esp8266_send_busy 

ESP8266 - fix send buffer exhaustion handling
pull/9335/head
Martin Kojtal 2019-01-10 12:24:09 +00:00 committed by GitHub
parent f4487b76da 7c112b2843
commit e25611aad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
View File

@ -557,6 +557,7 @@ bool ESP8266::dns_lookup(const char *name, char *ip)
nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount) nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount)
{ {
nsapi_error_t ret = NSAPI_ERROR_DEVICE_ERROR;
// +CIPSEND supports up to 2048 bytes at a time // +CIPSEND supports up to 2048 bytes at a time
// Data stream can be truncated // Data stream can be truncated
if (amount > 2048 && _sock_i[id].proto == NSAPI_TCP) { if (amount > 2048 && _sock_i[id].proto == NSAPI_TCP) {
@ -570,31 +571,50 @@ nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount)
_smutex.lock(); _smutex.lock();
set_timeout(ESP8266_SEND_TIMEOUT); set_timeout(ESP8266_SEND_TIMEOUT);
_busy = false; _busy = false;
if (_parser.send("AT+CIPSEND=%d,%lu", id, amount)
&& _parser.recv(">")
&& _parser.write((char *)data, (int)amount) >= 0
&& _parser.recv("SEND OK")) {
// No flow control, data overrun is possible
if (_serial_rts == NC) {
while (_parser.process_oob()); // Drain USART receive register
}
_smutex.unlock();
return NSAPI_ERROR_OK;
}
if (_error) {
_error = false; _error = false;
if (!_parser.send("AT+CIPSEND=%d,%lu", id, amount)) {
tr_debug("ESP8266::send(): AT+CIPSEND failed");
goto END;
} }
if(!_parser.recv(">")) {
tr_debug("ESP8266::send(): didn't get \">\"");
ret = NSAPI_ERROR_WOULD_BLOCK;
goto END;
}
if (_parser.write((char *)data, (int)amount) >= 0 && _parser.recv("SEND OK")) {
ret = NSAPI_ERROR_OK;
}
END:
_process_oob(ESP8266_RECV_TIMEOUT, true); // Drain USART receive register to avoid data overrun
// error hierarchy, from low to high
if (_busy) { if (_busy) {
set_timeout(); ret = NSAPI_ERROR_WOULD_BLOCK;
_smutex.unlock(); tr_debug("ESP8266::send(): modem busy");
tr_debug("returning WOULD_BLOCK"); }
return NSAPI_ERROR_WOULD_BLOCK;
if (ret == NSAPI_ERROR_DEVICE_ERROR) {
ret = NSAPI_ERROR_WOULD_BLOCK;
tr_debug("ESP8266::send(): send failed");
}
if (_error) {
ret = NSAPI_ERROR_CONNECTION_LOST;
tr_debug("ESP8266::send(): connection disrupted");
}
if (!_sock_i[id].open && ret != NSAPI_ERROR_OK) {
ret = NSAPI_ERROR_CONNECTION_LOST;
tr_debug("ESP8266::send(): socket closed abruptly");
} }
set_timeout(); set_timeout();
_smutex.unlock(); _smutex.unlock();
return NSAPI_ERROR_DEVICE_ERROR; return ret;
} }
void ESP8266::_oob_packet_hdlr() void ESP8266::_oob_packet_hdlr()