Merge pull request #70 from ARMmbed/fix_would_block_causing_disconnect

Veijo Pesonen · web-flow · commit 5a0a2cba8c12 · 2018-05-02T14:57:19.000+03:00
Fix would block causing disconnect
diff --git a/ESP8266/ESP8266.cpp b/ESP8266/ESP8266.cpp
@@ -370,7 +370,7 @@ void ESP8266::_packet_handler()
     struct packet *packet = (struct packet*)malloc(
             sizeof(struct packet) + amount);
     if (!packet) {
-        debug("Could not allocate memory for RX data");
+        debug("Could not allocate memory for RX data\n");
         return;
     }
 
diff --git a/ESP8266Interface.cpp b/ESP8266Interface.cpp
@@ -381,7 +381,7 @@ int ESP8266Interface::socket_recv(void *handle, void *data, unsigned size)
     int32_t recv;
     if (socket->proto == NSAPI_TCP) {
         recv = _esp.recv_tcp(socket->id, data, size);
-        if (recv <= 0) {
+        if (recv <= 0 && recv != NSAPI_ERROR_WOULD_BLOCK) {
             socket->connected = false;
         }
     } else {

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ void ESP8266::_packet_handler()`
`370`	`370`	`struct packet packet = (struct packet)malloc(`
`371`	`371`	`sizeof(struct packet) + amount);`
`372`	`372`	`if (!packet) {`
`373`		`- debug("Could not allocate memory for RX data");`
	`373`	`+ debug("Could not allocate memory for RX data\n");`
`374`	`374`	`return;`
`375`	`375`	`}`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ int ESP8266Interface::socket_recv(void handle, void data, unsigned size)`
`381`	`381`	`int32_t recv;`
`382`	`382`	`if (socket->proto == NSAPI_TCP) {`
`383`	`383`	`recv = _esp.recv_tcp(socket->id, data, size);`
`384`		`- if (recv <= 0) {`
	`384`	`+ if (recv <= 0 && recv != NSAPI_ERROR_WOULD_BLOCK) {`
`385`	`385`	`socket->connected = false;`
`386`	`386`	`}`
`387`	`387`	`} else {`