Merge pull request #4025 from ARMmbed/release-candidate

Release candidate for mbed-os-5.4.2

Author: 0xc0170

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -49,6 +49,7 @@ static void erase_range(flash_t *flash, uint32_t addr, uint32_t size)
         TEST_ASSERT_NOT_EQUAL(0, sector_size);
         int32_t ret = flash_erase_sector(flash, addr);
         TEST_ASSERT_EQUAL_INT32(0, ret);
+        addr += sector_size;
         size = size > sector_size ? size - sector_size : 0;
     }
 }

drivers/I2C.h

@@ -117,8 +117,8 @@ class I2C {
      *  @param repeated Repeated start, true - do not send stop at end
      *
      *  @returns
-     *      0 or non-zero - written number of bytes,
-     *      negative - I2C_ERROR_XXX status
+     *       0 on success (ack),
+     *   non-0 on failure (nack)
      */
     int write(int address, const char *data, int length, bool repeated = false);
 

features/FEATURE_COMMON_PAL/mbed-coap/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v4.0.3](https://github.com/ARMmbed/mbed-coap/releases/tag/v4.0.3)
+
+-[Full Changelog](https://github.com/ARMmbed/mbed-coap/compare/v4.0.2...v4.0.3)
+
+ **New feature**
+ 		
+ 	- CoAP Protocol Confirmable resend fix and minor memory optimization (IOTMAC-328)
+ 		
+ **Closed issues:**
+ 		
+ 	- IOTCLT-1439 - stuck in while loop
+
 ## [v4.0.0](https://github.com/ARMmbed/mbed-coap/releases/tag/v4.0.2)
 
 **New feature**

features/FEATURE_COMMON_PAL/mbed-coap/mbed-coap/sn_coap_protocol.h

@@ -83,7 +83,8 @@ extern int8_t sn_coap_protocol_destroy(struct coap_s *handle);
  *         In failure cases:\n
  *          -1 = Failure in CoAP header structure\n
  *          -2 = Failure in given pointer (= NULL)\n
- *          -3 = Failure in Reset message\ŋ
+ *          -3 = Failure in Reset message\n
+ *          -4 = Failure in Resending message store\n
  *         If there is not enough memory (or User given limit exceeded) for storing
  *         resending messages, situation is ignored.
  */

features/FEATURE_COMMON_PAL/mbed-coap/module.json

@@ -1,6 +1,6 @@
 {
   "name": "mbed-coap",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "COAP library",
   "keywords": [
     "coap",

features/FEATURE_COMMON_PAL/mbed-coap/source/include/sn_coap_header_internal.h

@@ -64,8 +64,6 @@ typedef struct sn_nsdl_transmit_ {
 
     uint16_t                packet_len;
     uint8_t                *packet_ptr;
-    uint8_t                *uri_path_ptr;
-    uint8_t                uri_path_len;
 } sn_nsdl_transmit_s;
 
 /* * * * * * * * * * * * * * * * * * * * * * */

features/FEATURE_COMMON_PAL/mbed-coap/source/sn_coap_builder.c

@@ -174,21 +174,16 @@ uint16_t sn_coap_builder_calc_needed_packet_data_size_2(sn_coap_hdr_s *src_coap_
             returned_byte_count += src_coap_msg_ptr->token_len;
         }
         /* URI PATH - Repeatable option. Length of one option is 0-255 */
-        /* Do not add uri-path for notification message.
-         * Uri-path is needed for cancelling observation with RESET message */
-        if (!src_coap_msg_ptr->options_list_ptr ||
-                (src_coap_msg_ptr->options_list_ptr &&
-                 COAP_OBSERVE_NONE == src_coap_msg_ptr->options_list_ptr->observe)) {
-            if (src_coap_msg_ptr->uri_path_ptr != NULL) {
-                repeatable_option_size = sn_coap_builder_options_calc_option_size(src_coap_msg_ptr->uri_path_len,
-                                         src_coap_msg_ptr->uri_path_ptr, COAP_OPTION_URI_PATH);
-                if (repeatable_option_size) {
-                    returned_byte_count += repeatable_option_size;
-                } else {
-                    return 0;
-                }
+        if (src_coap_msg_ptr->uri_path_ptr != NULL) {
+            repeatable_option_size = sn_coap_builder_options_calc_option_size(src_coap_msg_ptr->uri_path_len,
+                                     src_coap_msg_ptr->uri_path_ptr, COAP_OPTION_URI_PATH);
+            if (repeatable_option_size) {
+                returned_byte_count += repeatable_option_size;
+            } else {
+                return 0;
             }
         }
+
         uint16_t tempInt = 0;
         /* CONTENT FORMAT - An integer option, up to 2 bytes */
         if (src_coap_msg_ptr->content_format != COAP_CT_NONE) {
@@ -574,13 +569,8 @@ static int8_t sn_coap_builder_options_build(uint8_t **dst_packet_data_pptr, sn_c
                      &src_coap_msg_ptr->options_list_ptr->location_path_len, COAP_OPTION_LOCATION_PATH, &previous_option_number);
     }
     /* * * * Build Uri-Path option * * * */
-    /* Do not add uri-path for notification message.
-     * Uri-path is needed for cancelling observation with RESET message */
-    if (!src_coap_msg_ptr->options_list_ptr ||
-            (src_coap_msg_ptr->options_list_ptr &&
-             COAP_OBSERVE_NONE == src_coap_msg_ptr->options_list_ptr->observe))
-        sn_coap_builder_options_build_add_multiple_option(dst_packet_data_pptr, &src_coap_msg_ptr->uri_path_ptr,
-                 &src_coap_msg_ptr->uri_path_len, COAP_OPTION_URI_PATH, &previous_option_number);
+    sn_coap_builder_options_build_add_multiple_option(dst_packet_data_pptr, &src_coap_msg_ptr->uri_path_ptr,
+             &src_coap_msg_ptr->uri_path_len, COAP_OPTION_URI_PATH, &previous_option_number);
 
     /* * * * Build Content-Type option * * * */
     if (src_coap_msg_ptr->content_format != COAP_CT_NONE) {

features/FEATURE_COMMON_PAL/mbed-coap/source/sn_coap_parser.c

@@ -35,7 +35,6 @@
 #include "mbed-coap/sn_coap_protocol.h"
 #include "sn_coap_header_internal.h"
 #include "sn_coap_protocol_internal.h"
-
 /* * * * * * * * * * * * * * * * * * * * */
 /* * * * LOCAL FUNCTION PROTOTYPES * * * */
 /* * * * * * * * * * * * * * * * * * * * */
@@ -315,6 +314,7 @@ static int8_t sn_coap_parser_options_parse(struct coap_s *handle, uint8_t **pack
             (*packet_data_pptr) += 2;
         }
 
+        message_left = packet_len - (*packet_data_pptr - packet_data_start_ptr);
 
         /* * * Parse option itself * * */
         /* Some options are handled independently in own functions */
@@ -655,7 +655,7 @@ static int16_t sn_coap_parser_options_count_needed_memory_multiple_option(uint8_
     uint16_t i                      = 1;
 
     /* Loop all Uri-Query options */
-    while (i < packet_left_len) {
+    while (i <= packet_left_len) {
         if (option == COAP_OPTION_LOCATION_PATH && option_number_len > 255) {
             return -1;
         }
@@ -677,14 +677,13 @@ static int16_t sn_coap_parser_options_count_needed_memory_multiple_option(uint8_
 
         i += option_number_len;
         ret_value += option_number_len + 1; /* + 1 is for separator */
-        if(ret_value >= packet_left_len)
-            break;
-
-        if(ret_value >= packet_left_len)
-            break;
 
-        if( i == packet_left_len )
+        if( i == packet_left_len ) {
             break;
+        }
+        else if( i > packet_left_len ) {
+            return -1;
+        }
 
         if ((*(packet_data_ptr + i) >> COAP_OPTIONS_OPTION_NUMBER_SHIFT) != 0) {
             return (ret_value - 1);    /* -1 because last Part path does not include separator */
@@ -693,9 +692,19 @@ static int16_t sn_coap_parser_options_count_needed_memory_multiple_option(uint8_
         option_number_len = (*(packet_data_ptr + i) & 0x0F);
 
         if (option_number_len == 13) {
+
+            if(i + 1 >= packet_left_len) {
+                return -1;
+            }
+
             i++;
             option_number_len = *(packet_data_ptr + i) + 13;
         } else if (option_number_len == 14) {
+
+            if(i + 2 >= packet_left_len) {
+                return -1;
+            }
+
             option_number_len = *(packet_data_ptr + i + 2);
             option_number_len += (*(packet_data_ptr + i + 1) << 8) + 269;
             i += 2;
@@ -750,3 +759,4 @@ static int8_t sn_coap_parser_payload_parse(uint16_t packet_data_len, uint8_t *pa
     }
     return 0;
 }
+