Merge pull request #9284 from VeijoPesonen/bugfix-esp8266_socket_close

Cruz Monrreal · web-flow · commit b9d5dceb72cc · 2019-01-09T13:47:46.000-06:00
ESP8266: Fixes AT-layer socket_open-functions
diff --git a/components/wifi/esp8266-driver/ESP8266/ESP8266.cpp b/components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
@@ -472,8 +472,7 @@ nsapi_error_t ESP8266::open_udp(int id, const char *addr, int port, int local_po
                     _sock_already = false; // To be raised again by OOB msg
                     done = close(id);
                     if (!done) {
-                        MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CLOSE_FAILED), \
-                                   "ESP8266::_open_udp: device refused to close socket");
+                        break;
                     }
                 }
                 if (_error) {
@@ -491,9 +490,7 @@ nsapi_error_t ESP8266::open_udp(int id, const char *addr, int port, int local_po
 
     _smutex.unlock();
 
-    if (done) {
-        tr_debug("UDP socket %d opened", id);
-    }
+    tr_debug("UDP socket %d opened: %s", id, (_sock_i[id].open ? "true" : "false"));
 
     return done ? NSAPI_ERROR_OK : NSAPI_ERROR_DEVICE_ERROR;
 }
@@ -526,8 +523,7 @@ nsapi_error_t ESP8266::open_tcp(int id, const char *addr, int port, int keepaliv
                     _sock_already = false; // To be raised again by OOB msg
                     done = close(id);
                     if (!done) {
-                        MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CLOSE_FAILED), \
-                                   "ESP8266::_open_tcp: device refused to close socket");
+                        break;
                     }
                 }
                 if (_error) {
@@ -545,9 +541,7 @@ nsapi_error_t ESP8266::open_tcp(int id, const char *addr, int port, int keepaliv
 
     _smutex.unlock();
 
-    if (done) {
-        tr_debug("TCP socket %d opened", id);
-    }
+    tr_debug("TCP socket %d opened: %s", id, (_sock_i[id].open ? "true" : "false"));
 
     return done ? NSAPI_ERROR_OK : NSAPI_ERROR_DEVICE_ERROR;
 }

Original file line number	Diff line number	Diff line change
`@@ -472,8 +472,7 @@ nsapi_error_t ESP8266::open_udp(int id, const char *addr, int port, int local_po`
`472`	`472`	`_sock_already = false; // To be raised again by OOB msg`
`473`	`473`	`done = close(id);`
`474`	`474`	`if (!done) {`
`475`		`- MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CLOSE_FAILED), \`
`476`		`- "ESP8266::_open_udp: device refused to close socket");`
	`475`	`+ break;`
`477`	`476`	`}`
`478`	`477`	`}`
`479`	`478`	`if (_error) {`
`@@ -491,9 +490,7 @@ nsapi_error_t ESP8266::open_udp(int id, const char *addr, int port, int local_po`
`491`	`490`
`492`	`491`	`_smutex.unlock();`
`493`	`492`
`494`		`- if (done) {`
`495`		`- tr_debug("UDP socket %d opened", id);`
`496`		`- }`
	`493`	`+ tr_debug("UDP socket %d opened: %s", id, (_sock_i[id].open ? "true" : "false"));`
`497`	`494`
`498`	`495`	`return done ? NSAPI_ERROR_OK : NSAPI_ERROR_DEVICE_ERROR;`
`499`	`496`	`}`
`@@ -526,8 +523,7 @@ nsapi_error_t ESP8266::open_tcp(int id, const char *addr, int port, int keepaliv`
`526`	`523`	`_sock_already = false; // To be raised again by OOB msg`
`527`	`524`	`done = close(id);`
`528`	`525`	`if (!done) {`
`529`		`- MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CLOSE_FAILED), \`
`530`		`- "ESP8266::_open_tcp: device refused to close socket");`
	`526`	`+ break;`
`531`	`527`	`}`
`532`	`528`	`}`
`533`	`529`	`if (_error) {`
`@@ -545,9 +541,7 @@ nsapi_error_t ESP8266::open_tcp(int id, const char *addr, int port, int keepaliv`
`545`	`541`
`546`	`542`	`_smutex.unlock();`
`547`	`543`
`548`		`- if (done) {`
`549`		`- tr_debug("TCP socket %d opened", id);`
`550`		`- }`
	`544`	`+ tr_debug("TCP socket %d opened: %s", id, (_sock_i[id].open ? "true" : "false"));`
`551`	`545`
`552`	`546`	`return done ? NSAPI_ERROR_OK : NSAPI_ERROR_DEVICE_ERROR;`
`553`	`547`	`}`