From 9e72fa29e62aafb62d0c29e492f7a3332907e237 Mon Sep 17 00:00:00 2001
From: Hasnain Virk <hasnain.virk@arm.com>
Date: Wed, 17 Apr 2019 15:49:18 +0300
Subject: [PATCH] Updating Ublox to accomodate socket id assignment

Changes to accomodate socket id assigment upon actual creation of the
socket at the modem.
---
 .../targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp      | 12 +++++++-----
 .../targets/UBLOX/N2XX/UBLOX_N2XX_CellularStack.cpp  |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp
index 983bdafae0..499bbae176 100644
--- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp
+++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp
@@ -118,7 +118,7 @@ bool UBLOX_AT_CellularStack::is_protocol_supported(nsapi_protocol_t protocol)
 
 nsapi_error_t UBLOX_AT_CellularStack::create_socket_impl(CellularSocket *socket)
 {
-    int sock_id = 0;
+    int sock_id = SOCKET_UNUSED;
 
     _at.lock();
     if (socket->proto == NSAPI_UDP) {
@@ -146,13 +146,12 @@ nsapi_error_t UBLOX_AT_CellularStack::create_socket_impl(CellularSocket *socket)
     // Check for duplicate socket id delivered by modem
     for (int i = 0; i < UBLOX_MAX_SOCKET; i++) {
         CellularSocket *sock = _socket[i];
-        if (sock && sock->created && sock->id == sock_id) {
+        if (sock && sock != socket && sock->id == sock_id) {
             return NSAPI_ERROR_NO_SOCKET;
         }
     }
 
     socket->id = sock_id;
-    socket->created = true;
 
     return NSAPI_ERROR_OK;
 }
@@ -162,7 +161,7 @@ nsapi_error_t UBLOX_AT_CellularStack::socket_connect(nsapi_socket_t handle, cons
     CellularSocket *socket = (CellularSocket *)handle;
 
     if (socket) {
-        if (!socket->created) {
+        if (socket->id != SOCKET_UNUSED) {
             nsapi_error_t err = create_socket_impl(socket);
             if (err != NSAPI_ERROR_OK) {
                 return err;
@@ -192,6 +191,8 @@ nsapi_error_t UBLOX_AT_CellularStack::socket_connect(nsapi_socket_t handle, cons
 nsapi_size_or_error_t UBLOX_AT_CellularStack::socket_sendto_impl(CellularSocket *socket, const SocketAddress &address,
                                                                  const void *data, nsapi_size_t size)
 {
+    MBED_ASSERT(socket->id != -1);
+
     int sent_len = 0;
     pollfh fhs;
     fhs.fh = _at.get_file_handle();
@@ -261,6 +262,8 @@ nsapi_size_or_error_t UBLOX_AT_CellularStack::socket_sendto_impl(CellularSocket
 nsapi_size_or_error_t UBLOX_AT_CellularStack::socket_recvfrom_impl(CellularSocket *socket, SocketAddress *address,
                                                                    void *buffer, nsapi_size_t size)
 {
+    MBED_ASSERT(socket->id != -1);
+
     nsapi_size_or_error_t nsapi_error_size = NSAPI_ERROR_DEVICE_ERROR;
     bool success = true;
     nsapi_size_t read_blk;
@@ -430,7 +433,6 @@ void UBLOX_AT_CellularStack::clear_socket(CellularSocket *socket)
         socket->pending_bytes = 0;
         socket->_cb      = NULL;
         socket->_data    = NULL;
-        socket->created  = false;
     }
 }
 
diff --git a/features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularStack.cpp b/features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularStack.cpp
index 48fda262aa..dc0e0dd793 100644
--- a/features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularStack.cpp
+++ b/features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularStack.cpp
@@ -75,7 +75,7 @@ bool UBLOX_N2XX_CellularStack::is_protocol_supported(nsapi_protocol_t protocol)
 
 nsapi_error_t UBLOX_N2XX_CellularStack::create_socket_impl(CellularSocket *socket)
 {
-    int sock_id = 0;
+    int sock_id = -1;
     int localport = socket->localAddress.get_port();
 
     if (localport == 5683 || localport < 0 || localport > 65535) {
@@ -101,13 +101,12 @@ nsapi_error_t UBLOX_N2XX_CellularStack::create_socket_impl(CellularSocket *socke
     // Check for duplicate socket id delivered by modem
     for (int i = 0; i < N2XX_MAX_SOCKET; i++) {
         CellularSocket *sock = _socket[i];
-        if (sock && sock->created && sock->id == sock_id) {
+        if (sock && sock != socket && sock->id == sock_id) {
             return NSAPI_ERROR_NO_SOCKET;
         }
     }
 
     socket->id = sock_id;
-    socket->created = true;
 
     return NSAPI_ERROR_OK;
 }
@@ -115,6 +114,8 @@ nsapi_error_t UBLOX_N2XX_CellularStack::create_socket_impl(CellularSocket *socke
 nsapi_size_or_error_t UBLOX_N2XX_CellularStack::socket_sendto_impl(CellularSocket *socket, const SocketAddress &address,
                                                                    const void *data, nsapi_size_t size)
 {
+    MBED_ASSERT(socket->id != -1);
+
     if (size > N2XX_MAX_PACKET_SIZE) {
         return NSAPI_ERROR_PARAMETER;
     }
@@ -150,6 +151,8 @@ nsapi_size_or_error_t UBLOX_N2XX_CellularStack::socket_sendto_impl(CellularSocke
 nsapi_size_or_error_t UBLOX_N2XX_CellularStack::socket_recvfrom_impl(CellularSocket *socket, SocketAddress *address,
                                                                      void *buffer, nsapi_size_t size)
 {
+    MBED_ASSERT(socket->id != -1);
+
     nsapi_size_or_error_t nsapi_error_size = NSAPI_ERROR_DEVICE_ERROR;
     nsapi_size_t read_blk, usorf_sz, count = 0, length = size;
     bool success = true;