Merge pull request #6691 from mirelachirica/cellular_fixes

Cellular fixes

Author: Cruz Monrreal

features/cellular/TESTS/socket/udp/main.cpp

@@ -82,7 +82,7 @@ class EchoSocket : public UDPSocket {
 			_data[i] = (uint8_t)rand();
 		}
 		// clear pending events
-		while ((EchoSocket::eventFlags.wait_any(_async_flag, SOCKET_TIMEOUT) & (osFlagsError | _async_flag)) == _async_flag);
+		TEST_ASSERT(!(EchoSocket::eventFlags.clear(_async_flag) & osFlagsError));
 		if (hostname) {
 			TEST_ASSERT(sendto(hostname, ECHO_SERVER_UDP_PORT, _data, _size) == _size);
 		} else {

features/cellular/framework/AT/ATHandler.cpp

@@ -25,9 +25,11 @@
 #include "rtos/Thread.h"
 #endif
 #include "Kernel.h"
+#include "CellularUtil.h"
 
 using namespace mbed;
 using namespace events;
+using namespace mbed_cellular_util;
 
 //#define MBED_TRACE_MAX_LEVEL TRACE_LEVEL_DEBUG
 #include "CellularLog.h"
@@ -456,59 +458,82 @@ ssize_t ATHandler::read_bytes(uint8_t *buf, size_t len)
     return read_len;
 }
 
-ssize_t ATHandler::read_string(char *buf, size_t size, bool read_even_stop_tag)
+ssize_t ATHandler::read(char *buf, size_t size, bool read_even_stop_tag, bool hex)
 {
     tr_debug("%s", __func__);
-    at_debug("\n----------read_string buff:----------\n");
+    at_debug("\n----------read buff:----------\n");
     for (size_t i = _recv_pos; i < _recv_len; i++) {
         at_debug("%c", _recv_buff[i]);
     }
-    at_debug("\n----------buff----------\n");
+    at_debug("\n----------read end----------\n");
 
     if (_last_err || !_stop_tag || (_stop_tag->found && read_even_stop_tag == false)) {
         return -1;
     }
 
-    uint8_t *pbuf = (uint8_t*)buf;
-
-    size_t len = 0;
     size_t match_pos = 0;
+    size_t upper = 0, lower = 0;
+    size_t read_size = hex ? size*2 : size;
+
+    uint8_t *pbuf = (uint8_t*)buf;
 
     consume_char('\"');
 
-    for (; len < (size + match_pos); len++) {
-        int c = get_char();
+    size_t read_idx = 0;
+    size_t buf_idx = 0;
+
+    for (; read_idx < (read_size + match_pos); read_idx++) {
+        char c = get_char();
+        buf_idx = hex ? read_idx/2 : read_idx;
         if (c == -1) {
-            pbuf[len] = '\0';
+            pbuf[buf_idx] = '\0';
             set_error(NSAPI_ERROR_DEVICE_ERROR);
             return -1;
         } else if (c == _delimiter) {
-            pbuf[len] = '\0';
+            pbuf[buf_idx] = '\0';
             break;
         } else if (c == '\"') {
             match_pos = 0;
-            if (len > 0) {
-                len--;
+            if (read_idx > 0) {
+                read_idx--;
             }
             continue;
         } else if (_stop_tag->len && c == _stop_tag->tag[match_pos]) {
             match_pos++;
             if (match_pos == _stop_tag->len) {
                 _stop_tag->found = true;
                 // remove tag from string if it was matched
-                len -= (_stop_tag->len - 1);
-                pbuf[len] = '\0';
+                buf_idx -= (_stop_tag->len - 1);
+                pbuf[buf_idx] = '\0';
                 break;
             }
         } else if (match_pos) {
             match_pos = 0;
         }
 
-        pbuf[len] = c;
+        if (!hex) {
+           pbuf[buf_idx] = c;
+        } else {
+            if (read_idx % 2 == 0) {
+                upper = hex_str_to_int(&c, 1);
+            } else {
+                lower = hex_str_to_int(&c, 1);
+                pbuf[buf_idx] = ((upper<<4) & 0xF0) | (lower & 0x0F);
+            }
+        }
     }
 
-    // Do we need _stop_found set after reading by size -> is _stop_tag_by_len needed or not?
-    return len;
+    return buf_idx + 1;
+}
+
+ssize_t ATHandler::read_string(char *buf, size_t size, bool read_even_stop_tag)
+{
+    return read(buf, size, read_even_stop_tag, false);
+}
+
+ssize_t ATHandler::read_hex_string(char *buf, size_t size)
+{
+    return read(buf, size, false, true);
 }
 
 int32_t ATHandler::read_int()

features/cellular/framework/AT/ATHandler.h

@@ -303,6 +303,17 @@ class ATHandler
      */
     ssize_t read_string(char *str, size_t size, bool read_even_stop_tag = false);
 
+    /** Reads chars representing hex ascii values and converts them to the corresponding chars.
+     *  For example: "4156" to "AV".
+     *  Terminates with null. Skips the quotation marks.
+     *  Stops on delimiter or stop tag.
+     *
+     *  @param str output buffer for the read
+     *  @param size maximum number of chars to output
+     *  @return length of output string or -1 in case of read timeout before delimiter or stop tag is found
+     */
+    ssize_t read_hex_string(char *str, size_t size);
+
     /** Reads as string and converts result to integer. Supports only positive integers.
      *
      *  @return the positive integer or -1 in case of error.
@@ -482,6 +493,8 @@ class ATHandler
 
     // check is urc is already added
     bool find_urc_handler(const char *prefix, mbed::Callback<void()> callback);
+
+    ssize_t read(char *buf, size_t size, bool read_even_stop_tag, bool hex);
 };
 
 } // namespace mbed

features/cellular/framework/common/CellularList.h

@@ -38,6 +38,16 @@ template <class T> class CellularList
       _tail=NULL;
     }
 
+     ~CellularList()
+    {
+        T *temp = _head;
+        while (temp) {
+            _head = _head->next;
+            delete temp;
+            temp = _head;
+        }
+    }
+
     T* add_new()
     {
       T *temp=new T;
@@ -88,6 +98,7 @@ template <class T> class CellularList
             delete temp;
             temp = _head;
         }
+        _tail=NULL;
     }
 
 

features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularStack.cpp

@@ -154,7 +154,7 @@ nsapi_size_or_error_t QUECTEL_BC95_CellularStack::socket_sendto_impl(CellularSoc
     _at.write_int(socket->id);
     _at.write_string(address.get_ip_address(), false);
     _at.write_int(address.get_port());
-    _at.write_int(size);
+    _at.write_int(size <= BC95_MAX_PACKET_SIZE ? size : BC95_MAX_PACKET_SIZE);
     _at.write_string(hexstr, false);
     _at.cmd_stop();
     _at.resp_start();
@@ -178,25 +178,23 @@ nsapi_size_or_error_t QUECTEL_BC95_CellularStack::socket_recvfrom_impl(CellularS
     nsapi_size_or_error_t recv_len=0;
     int port;
     char ip_address[NSAPI_IP_SIZE];
-    char *hexstr = new char[BC95_MAX_PACKET_SIZE*2+1];
 
     _at.cmd_start("AT+NSORF=");
     _at.write_int(socket->id);
-    _at.write_int(size);
+    _at.write_int(size <= BC95_MAX_PACKET_SIZE ? size : BC95_MAX_PACKET_SIZE);
     _at.cmd_stop();
     _at.resp_start();
     // receiving socket id
     _at.skip_param();
     _at.read_string(ip_address, sizeof(ip_address));
     port = _at.read_int();
     recv_len = _at.read_int();
-    int hexlen = _at.read_string(hexstr, BC95_MAX_PACKET_SIZE*2+1);
+    int hexlen = _at.read_hex_string((char*)buffer, size);
     // remaining length
     _at.skip_param();
     _at.resp_stop();
 
     if (!recv_len || (recv_len == -1) || (_at.get_last_error() != NSAPI_ERROR_OK)) {
-        delete hexstr;
         return NSAPI_ERROR_WOULD_BLOCK;
     }
 
@@ -205,10 +203,8 @@ nsapi_size_or_error_t QUECTEL_BC95_CellularStack::socket_recvfrom_impl(CellularS
         address->set_port(port);
     }
 
-    if (hexlen > 0) {
-        hex_str_to_char_str((const char*) hexstr, hexlen, (char*)buffer);
+    if (recv_len != hexlen) {
+        tr_error("Not received as much data as expected. Should receive: %d bytes, received: %d bytes", recv_len, hexlen);
     }
-
-    delete hexstr;
     return recv_len;
 }

features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularStack.h

@@ -21,7 +21,7 @@
 #include "AT_CellularStack.h"
 
 #define BC95_SOCKET_MAX 7
-#define BC95_MAX_PACKET_SIZE 512
+#define BC95_MAX_PACKET_SIZE 1358
 
 namespace mbed {
 

features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularNetwork.cpp

@@ -30,9 +30,7 @@ QUECTEL_BG96_CellularNetwork::~QUECTEL_BG96_CellularNetwork()
 
 bool QUECTEL_BG96_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_stack)
 {
-    if ((requested_stack == IPV4_STACK) ||
-        (requested_stack == IPV6_STACK) ||
-        (requested_stack == IPV4V6_STACK)) {
+    if (requested_stack == IPV4_STACK) {
         return true;
     }