Adds check for already opened socket

Author: Veijo Pesonen

ESP8266/ESP8266.cpp

@@ -37,6 +37,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
       _at_v(-1,-1,-1),
       _connect_error(0),
       _fail(false),
+      _sock_already(false),
       _closed(false),
       _connection_status(NSAPI_STATUS_DISCONNECTED),
       _heap_usage(0)
@@ -57,6 +58,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
     _parser.oob("4,CLOSED", callback(this, &ESP8266::_oob_socket4_closed_handler));
     _parser.oob("WIFI ", callback(this, &ESP8266::_connection_status_handler));
     _parser.oob("UNLINK", callback(this, &ESP8266::_oob_socket_close_error));
+    _parser.oob("ALREADY CONNECTED", callback(this, &ESP8266::_oob_cipstart_already_connected));
 
     for(int i= 0; i < SOCKET_COUNT; i++) {
         _socket_open[i].id = -1;
@@ -396,61 +398,68 @@ nsapi_error_t ESP8266::open_udp(int id, const char* addr, int port, int local_po
     static const char *type = "UDP";
     bool done = false;
 
-    if (id >= SOCKET_COUNT) {
+    if (id >= SOCKET_COUNT || _socket_open[id].id == id) {
         return NSAPI_ERROR_PARAMETER;
-    } else if (_socket_open[id].id == id) {
-        return NSAPI_ERROR_IS_CONNECTED;
     }
 
     _smutex.lock();
     if(local_port) {
-        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d,%d", id, type, addr, port, local_port)
-                && _parser.recv("OK\n");
+        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d,%d", id, type, addr, port, local_port);
     } else {
-        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d", id, type, addr, port)
-               && _parser.recv("OK\n");
+        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d", id, type, addr, port);
     }
 
     if (done) {
+        if (!_parser.recv("OK\n")) {
+            if (_sock_already) {
+                _sock_already = false; // To be raised again by OOB msg
+                _smutex.unlock();
+                return NSAPI_ERROR_IS_CONNECTED;
+            }
+        }
+
         _socket_open[id].id = id;
         _socket_open[id].proto = NSAPI_UDP;
-    }
-
-    _clear_socket_packets(id);
 
+        _clear_socket_packets(id);
+    }
     _smutex.unlock();
 
     return done ? NSAPI_ERROR_OK : NSAPI_ERROR_DEVICE_ERROR;
 }
 
-bool ESP8266::open_tcp(int id, const char* addr, int port, int keepalive)
+nsapi_error_t ESP8266::open_tcp(int id, const char* addr, int port, int keepalive)
 {
     static const char *type = "TCP";
     bool done = false;
 
     if (id >= SOCKET_COUNT || _socket_open[id].id == id) {
-        return false;
+        return NSAPI_ERROR_PARAMETER;
     }
 
     _smutex.lock();
     if(keepalive) {
-        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d,%d", id, type, addr, port, keepalive)
-                && _parser.recv("OK\n");
+        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d,%d", id, type, addr, port, keepalive);
     } else {
-        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d", id, type, addr, port)
-               && _parser.recv("OK\n");
+        done = _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d", id, type, addr, port);
     }
 
     if (done) {
+        if (!_parser.recv("OK\n")) {
+            if (_sock_already) {
+                _sock_already = false; // To be raised again by OOB msg
+                _smutex.unlock();
+                return NSAPI_ERROR_IS_CONNECTED;
+            }
+        }
         _socket_open[id].id = id;
         _socket_open[id].proto = NSAPI_TCP;
-    }
-
-    _clear_socket_packets(id);
 
+        _clear_socket_packets(id);
+    }
     _smutex.unlock();
 
-    return done;
+    return done ? NSAPI_ERROR_OK : NSAPI_ERROR_DEVICE_ERROR;
 }
 
 bool ESP8266::dns_lookup(const char* name, char* ip)
@@ -787,6 +796,13 @@ void ESP8266::_connect_error_handler()
     }
 }
 
+
+void ESP8266::_oob_cipstart_already_connected()
+{
+    _sock_already = true;
+    _parser.abort();
+}
+
 void ESP8266::_oob_socket_close_error()
 {
     if (_parser.recv("ERROR\n")) {

ESP8266/ESP8266.h

@@ -132,7 +132,7 @@ class ESP8266
     *
     * @param ap the name of the AP
     * @param passPhrase the password of AP
-    * @return NSAPI_ERROR_OK only if ESP8266 is connected successfully
+    * @return NSAPI_ERROR_OK in success, negative error code in failure
     */
     nsapi_error_t connect(const char *ap, const char *passPhrase);
 
@@ -203,7 +203,7 @@ class ESP8266
     * @param addr the IP address of the destination
     * @param port the port on the destination
     * @param local_port UDP socket's local port, zero means any
-    * @return true only if socket opened successfully
+    * @return NSAPI_ERROR_OK in success, negative error code in failure
     */
     nsapi_error_t open_udp(int id, const char* addr, int port, int local_port = 0);
 
@@ -216,9 +216,9 @@ class ESP8266
     * @param addr the IP address of the destination
     * @param port the port on the destination
     * @param tcp_keepalive TCP connection's keep alive time, zero means disabled
-    * @return true only if socket opened successfully
+    * @return NSAPI_ERROR_OK in success, negative error code in failure
     */
-    bool open_tcp(int id, const char* addr, int port, int keepalive = 0);
+    nsapi_error_t open_tcp(int id, const char* addr, int port, int keepalive = 0);
 
     /**
     * Sends data to an open socket
@@ -362,6 +362,7 @@ class ESP8266
     struct fw_at_version _at_v;
     void _packet_handler();
     void _connect_error_handler();
+    void _oob_cipstart_already_connected();
     bool recv_ap(nsapi_wifi_ap_t *ap);
     void _oob_socket0_closed_handler();
     void _oob_socket1_closed_handler();
@@ -385,6 +386,7 @@ class ESP8266
 
     int _connect_error;
     bool _fail;
+    bool _sock_already;
     bool _closed;
     struct _sock_info _socket_open[SOCKET_COUNT];
     nsapi_connection_status_t _connection_status;

ESP8266Interface.cpp

@@ -409,17 +409,13 @@ int ESP8266Interface::socket_connect(void *handle, const SocketAddress &addr)
 
     if (socket->proto == NSAPI_UDP) {
         ret = _esp.open_udp(socket->id, addr.get_ip_address(), addr.get_port(), _local_ports[socket->id]);
-        if (ret != NSAPI_ERROR_OK) {
-            return ret;
-        }
     } else {
-        if (!_esp.open_tcp(socket->id, addr.get_ip_address(), addr.get_port(), socket->keepalive)) {
-            return NSAPI_ERROR_DEVICE_ERROR;
-        }
+        ret = _esp.open_tcp(socket->id, addr.get_ip_address(), addr.get_port(), socket->keepalive);
     }
 
-    socket->connected = true;
-    return 0;
+    socket->connected = (ret == NSAPI_ERROR_OK) ? true : false;
+
+    return ret;
 }
 
 int ESP8266Interface::socket_accept(void *server, void **socket, SocketAddress *addr)