Merge pull request #6876 from JuhPuur/master

Nanostack release for Mbed OS 5.9

Author: Cruz Monrreal

features/frameworks/mbed-trace/README.md

@@ -169,6 +169,13 @@ yotta target x86-linux-native
 yotta test mbed_trace_test
 ```
 
+* In Mac
+
+```
+yotta target x86-osx-native
+yotta test mbed_trace_test
+```
+
 * In Windows
 
 ```

features/frameworks/mbed-trace/module.json

@@ -27,6 +27,10 @@
       "cpputest": "ARMmbed/cpputest",
       "nanostack-libservice": "^3.6.0"
     },
+    "x86-osx-native": {
+      "cpputest": "ARMmbed/cpputest",
+      "nanostack-libservice": "^3.6.0"
+    },
     "x86-windows-native": {
       "cpputest": "ARMmbed/cpputest",
       "nanostack-libservice": "^3.6.0"

features/frameworks/mbed-trace/source/CMakeLists.txt

@@ -4,6 +4,12 @@ if(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
     )
     add_definitions("-g -O0 -fprofile-arcs -ftest-coverage")
     target_link_libraries(mbed-trace gcov nanostack-libservice)
+elseif(DEFINED TARGET_LIKE_X86_OSX_NATIVE)
+    add_library( mbed-trace
+        mbed_trace.c
+    )
+    add_definitions("-g -O0")
+    target_link_libraries(mbed-trace nanostack-libservice)
 else()
     add_library( mbed-trace
         mbed_trace.c

features/frameworks/mbed-trace/test/CMakeLists.txt

@@ -1,5 +1,5 @@
 # only build tests on targets that declare they are like posix
-if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE OR DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
+if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE OR DEFINED TARGET_LIKE_X86_LINUX_NATIVE OR DEFINED TARGET_LIKE_X86_OSX_NATIVE)
 
     # describe the test executable
     add_executable(mbed_trace_test EXCLUDE_FROM_ALL Test.cpp stubs/ip6tos_stub.c)
@@ -13,10 +13,13 @@ if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE OR DEFINED TARGET_LIKE_X86_LINUX_NATIV
     if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE)
         add_test(mbed_trace_test "build/x86-windows-native/test/mbed_trace_test")
         add_dependencies(all_tests mbed_trace_test)
-    endif()
-    if(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
+    elseif(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
         SET(TEST_EXECUTABLE "../../../build/x86-linux-native/test/mbed_trace_test")
         add_test(mbed_trace_test ${TEST_EXECUTABLE})
         add_dependencies(all_tests mbed_trace_test)
+    elseif(DEFINED TARGET_LIKE_X86_OSX_NATIVE)
+        SET(TEST_EXECUTABLE "../../../build/x86-osx-native/test/mbed_trace_test")
+        add_test(mbed_trace_test ${TEST_EXECUTABLE})
+        add_dependencies(all_tests mbed_trace_test)
     endif()
 endif()

features/frameworks/mbed-trace/test/Test.cpp

@@ -454,6 +454,17 @@ TEST(trace, filters_control)
     mbed_trace_exclude_filters_set(0);
     STRCMP_EQUAL("", mbed_trace_exclude_filters_get());
 }
+TEST(trace, cmd_printer)
+{
+  buf[0] = 0;
+  mbed_trace_config_set(TRACE_ACTIVE_LEVEL_ALL);
+  mbed_tracef(TRACE_LEVEL_CMD, "mygr", "default printer");
+  STRCMP_EQUAL("default printer", buf);
+
+  mbed_trace_cmdprint_function_set( myprint );
+  mbed_tracef(TRACE_LEVEL_CMD, "mygr", "custom printer");
+  STRCMP_EQUAL("\n", buf); // because there is two print calls, second one add line feeds
+}
 TEST(trace, no_printer)
 {
     mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "hello");

features/frameworks/nanostack-libservice/mbed-client-libservice/common_functions.h

@@ -114,6 +114,29 @@ NS_INLINE uint8_t *common_write_24_bit(uint_fast24_t value, uint8_t ptr[__static
  */
 NS_INLINE uint_fast24_t common_read_24_bit(const uint8_t data_buf[__static 3]);
 
+/*
+ * Common write 24-bit variable to 8-bit pointer.
+ *
+ * Write 24 bits in little-endian byte order.
+ *
+ * \param value 24-bit variable
+ * \param ptr pointer where data to be written
+ *
+ * \return updated pointer
+ */
+NS_INLINE uint8_t *common_write_24_bit_inverse(uint_fast24_t value, uint8_t ptr[__static 3]);
+
+/*
+ * Common read 24-bit variable from 8-bit pointer.
+ *
+ * Read 24 bits in little-endian byte order.
+ *
+ * \param data_buf pointer where data to be read
+ *
+ * \return 24-bit variable
+ */
+NS_INLINE uint_fast24_t common_read_24_bit_inverse(const uint8_t data_buf[__static 3]);
+
 /*
  * Common write 16-bit variable to 8-bit pointer.
  *
@@ -420,6 +443,23 @@ COMMON_FUNCTIONS_FN uint_fast24_t common_read_24_bit(const uint8_t data_buf[__st
     return temp_24;
 }
 
+COMMON_FUNCTIONS_FN uint8_t *common_write_24_bit_inverse(uint_fast24_t value, uint8_t ptr[__static 3])
+{
+    *ptr++ = value;
+    *ptr++ = value >> 8;
+    *ptr++ = value >> 16;
+    return ptr;
+}
+
+COMMON_FUNCTIONS_FN uint_fast24_t common_read_24_bit_inverse(const uint8_t data_buf[__static 3])
+{
+    uint_fast24_t temp_24;
+    temp_24 =  *data_buf++;
+    temp_24 += (uint_fast24_t)(*data_buf++) << 8;
+    temp_24 += (uint_fast24_t)(*data_buf++) << 16;
+    return temp_24;
+}
+
 COMMON_FUNCTIONS_FN uint8_t *common_write_16_bit(uint16_t value, uint8_t ptr[__static 2])
 {
     *ptr++ = value >> 8;

features/nanostack/coap-service/source/coap_security_handler.c

@@ -51,8 +51,8 @@ struct coap_security_s {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     mbedtls_x509_crt            _cacert;
     mbedtls_x509_crt            _owncert;
-#endif
     mbedtls_pk_context          _pkey;
+#endif
 
     uint8_t                     _pw[64];
     uint8_t                     _pw_len;
@@ -109,8 +109,8 @@ static int coap_security_handler_init(coap_security_t *sec){
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     mbedtls_x509_crt_init( &sec->_cacert );
     mbedtls_x509_crt_init( &sec->_owncert );
-#endif
     mbedtls_pk_init( &sec->_pkey );
+#endif
 
     memset(&sec->_cookie, 0, sizeof(simple_cookie_t));
     memset(&sec->_keyblk, 0, sizeof(key_block_t));
@@ -145,9 +145,8 @@ static void coap_security_handler_reset(coap_security_t *sec){
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     mbedtls_x509_crt_free(&sec->_cacert);
     mbedtls_x509_crt_free(&sec->_owncert);
-#endif
-
     mbedtls_pk_free(&sec->_pkey);
+#endif
 
     mbedtls_entropy_free( &sec->_entropy );
     mbedtls_ctr_drbg_free( &sec->_ctr_drbg );
@@ -196,6 +195,7 @@ void coap_security_destroy(coap_security_t *sec){
     }
 }
 
+#ifdef MBEDTLS_SSL_SRV_C
 /**** Random number functions ****/
 
 /**
@@ -265,6 +265,7 @@ static int simple_cookie_check(void *ctx,
     }
     return 0;
 }
+#endif // MBEDTLS_SSL_SRV_C
 
 /**** Key export function ****/
 #if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)

features/nanostack/sal-stack-nanostack/nanostack/net_interface.h

@@ -995,6 +995,7 @@ extern void net_get_version_information(uint8_t *ptr);
  *
  * Note! In Thread mode parent buffer size is automatically set during Thread initialization.
  *
+ * \param interface_id Network interface ID.
  * \param big_packet_threshold Indicate how long packets are considered big. For Thread, must be 106 bytes.
  * \param small_packets_per_child_count Number of small packets stored for each sleepy children. For Thread, must be at least 1.
  * \param big_packets_total_count Total number of big packets parent can store for all sleepy children. For Thread, must be at least 1.

features/nanostack/sal-stack-nanostack/nanostack/net_test_api.h

@@ -24,6 +24,7 @@
 #define NET_TEST_API_H_
 
 #include "ns_types.h"
+#include "Service_Libs/mle_service/mle_service_api.h"
 
 /**
  * \brief Makes TCP protocol drop given number of packets from a particular state (TX side).
@@ -56,4 +57,11 @@ int8_t arm_nwk_test_tcp_drop_rx(int state, uint8_t count);
  */
 void arm_nwk_test_tcp_drop_reset(void);
 
+/**
+ * \brief Set callback for MLE message receiving filter.
+ *
+ * Testing API for setting MLE receive callback for message filtering purposes.
+ */
+void arm_nwk_test_mle_receive_filter_set(mle_service_filter_cb *response_filter_cb);
+
 #endif //NET_TEST_API_H_

features/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h

@@ -274,6 +274,19 @@ int thread_test_increment_key_sequence_counter(int8_t interface_id);
  */
 int thread_test_key_sequence_counter_update(int8_t interface_id, uint32_t thrKeySequenceCounter);
 
+/**
+ * \brief Resets cached values from stack
+ *
+ Resets link configuration from cache and from  NVM.
+ *
+  *
+ * \param interface_id Network Interface
+  *
+ * \return 0, OK
+ * \return <0 Error
+ */
+int thread_test_stack_cache_reset(int8_t interface_id);
+
 /**
  * \brief Set new Thread key rotation value
  *

features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -758,7 +758,7 @@ static int mle_router_accept_request_build(protocol_interface_info_entry_t *cur,
 
 static void protocol_6lowpan_link_reject_handler(protocol_interface_info_entry_t *cur, uint8_t *ll64)
 {
-    mle_neigh_table_entry_t *entry_temp = mle_class_get_entry_by_ll64(cur->id, 0, ll64, false);
+    mle_neigh_table_entry_t *entry_temp = mle_class_get_entry_by_ll64(cur->id, 0, ll64, false, NULL);
     tr_debug("MLE link reject");
     if (entry_temp) {
         mle_class_remove_entry(cur->id, entry_temp);
@@ -1081,7 +1081,7 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
                 mle_6lowpan_data->link_req_token_bucket--;
             } else {
                 //Update only old information based on link request
-                entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false);
+                entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false, NULL);
                 if (entry_temp) {
                     mle_neigh_time_and_mode_update(entry_temp,mle_msg->data_ptr, mle_msg->data_length);
                     mle_neigh_entry_update_by_mle_tlv_list(interface_id, entry_temp, mle_msg->data_ptr, mle_msg->data_length, cur->mac, own_mac16);
@@ -1118,12 +1118,12 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
 
             tr_debug("Accept & Request");
 
-            entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false);
+            entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false, NULL);
 
             if (!entry_temp) {
                 // If there is space for neighbors try to allocate new entry
                 if (mle_6lowpan_neighbor_limit_check(interface_id, mle_msg, true)) {
-                    entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, true);
+                    entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, true, NULL);
                 }
             }
 
@@ -1185,7 +1185,7 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
                     mode = *t_ptr;
                 }
 
-                entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false);
+                entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false, NULL);
                 if (!entry_temp) {
                     if ((mode & MLE_DEV_MASK) == MLE_FFD_DEV) {
                         // If there is space for neighbors synchronizes to new router
@@ -2787,7 +2787,7 @@ bool lowpan_neighbour_data_clean(int8_t interface_id, const uint8_t *link_local_
 {
     bool return_value = false;
 #ifndef NO_MLE
-    mle_neigh_table_entry_t * neigh_entry = mle_class_get_entry_by_ll64(interface_id, 0, link_local_address, false);
+    mle_neigh_table_entry_t * neigh_entry = mle_class_get_entry_by_ll64(interface_id, 0, link_local_address, false, NULL);
     if (neigh_entry) {
         //Remove entry
         if (neigh_entry->priorityFlag) {

features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c

@@ -87,7 +87,10 @@ static int8_t set_6lowpan_nwk_down(protocol_interface_info_entry_t *cur)
 #endif
             }
         }
-        uint16_t pan_id = cur->mac_parameters->pan_id;
+        if (cur->lowpan_info & INTERFACE_NWK_BOOTSRAP_PANA_AUTHENTICATION) {
+            pana_reset_values(cur->mac_parameters->pan_id);
+        }
+
         if (cur->interface_mode == INTERFACE_UP) {
             if (cur->mac_api) {
                 mlme_reset_t reset;
@@ -105,9 +108,6 @@ static int8_t set_6lowpan_nwk_down(protocol_interface_info_entry_t *cur)
         reassembly_interface_reset(cur->id);
 
         icmp_nd_routers_init();
-        if (cur->lowpan_info & INTERFACE_NWK_BOOTSRAP_PANA_AUTHENTICATION) {
-            pana_reset_values(pan_id);
-        }
 
         if (cur->pana_sec_info_temp) {
             ns_dyn_mem_free(cur->pana_sec_info_temp);

features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c

@@ -433,8 +433,9 @@ void mac_helper_coordinator_address_set(protocol_interface_info_entry_t *interfa
     if (adr_type == ADDR_802_15_4_SHORT) {
         memcpy(interface->mac_parameters->mac_cordinator_info.mac_mlme_coord_address, adr_ptr, 2);
         interface->mac_parameters->mac_cordinator_info.cord_adr_mode = MAC_ADDR_MODE_16_BIT;
+        uint16_t short_addr = common_read_16_bit(interface->mac_parameters->mac_cordinator_info.mac_mlme_coord_address);
         set_req.attr = macCoordShortAddress;
-        set_req.value_pointer = &interface->mac_parameters->mac_cordinator_info.mac_mlme_coord_address;
+        set_req.value_pointer = &short_addr;
         set_req.value_size = 2;
     } else if (adr_type == ADDR_802_15_4_LONG) {
         memcpy(interface->mac_parameters->mac_cordinator_info.mac_mlme_coord_address, adr_ptr, 8);
@@ -767,8 +768,10 @@ static uint8_t mac_helper_header_security_aux_header_length(uint8_t keyIdmode) {
     switch (keyIdmode) {
         case MAC_KEY_ID_MODE_SRC8_IDX:
             header_length += 4; //64-bit key source first part
+            /* fall through  */
         case MAC_KEY_ID_MODE_SRC4_IDX:
             header_length += 4; //32-bit key source inline
+            /* fall through  */
         case MAC_KEY_ID_MODE_IDX:
             header_length += 1;
             break;
@@ -830,13 +833,13 @@ void mac_helper_devicetable_remove(mac_api_t *mac_api, uint8_t attribute_index)
     mac_api->mlme_req(mac_api,MLME_SET , &set_req);
 }
 
-void mac_helper_devicetable_set(mle_neigh_table_entry_t *entry_temp, protocol_interface_info_entry_t *cur, uint32_t frame_counter, uint8_t keyID)
+void mac_helper_devicetable_set(mle_neigh_table_entry_t *entry_temp, protocol_interface_info_entry_t *cur, uint32_t frame_counter, uint8_t keyID, bool force_set)
 {
     if (!cur->mac_api) {
         return;
     }
 
-    if (cur->mac_parameters->SecurityEnabled && cur->mac_parameters->mac_default_key_index != keyID) {
+    if (!force_set && cur->mac_parameters->SecurityEnabled && cur->mac_parameters->mac_default_key_index != keyID) {
         tr_debug("Do not set counter by index %u != %u", cur->mac_parameters->mac_default_key_index, keyID);
         return;
     }

features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h

@@ -110,7 +110,7 @@ int8_t mac_helper_link_frame_counter_set(int8_t interface_id, uint32_t seq_ptr);
 
 void mac_helper_devicetable_remove(struct mac_api_s *mac_api, uint8_t attribute_index);
 
-void mac_helper_devicetable_set(struct mle_neigh_table_entry_t *entry_temp, struct protocol_interface_info_entry *cur, uint32_t frame_counter, uint8_t keyID);
+void mac_helper_devicetable_set(struct mle_neigh_table_entry_t *entry_temp, struct protocol_interface_info_entry *cur, uint32_t frame_counter, uint8_t keyID, bool force_set);
 
 int8_t mac_helper_mac_mlme_max_retry_set(int8_t interface_id, uint8_t mac_retry_set);
 

features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c

@@ -252,6 +252,8 @@ int mac_pairwise_key_interface_unregister(int8_t interface_id)
 int mac_pairwise_key_add(int8_t interface_id, uint32_t valid_life_time, const uint8_t eui64[static 8], const uint8_t key[static 16])
 {
     protocol_interface_info_entry_t *interface = protocol_stack_interface_info_get_by_id(interface_id);
+    bool new_entry_created;
+
     if (!interface || !interface->mac_api) {
         return -1;
     }
@@ -264,7 +266,7 @@ int mac_pairwise_key_add(int8_t interface_id, uint32_t valid_life_time, const ui
     }
 
     //Allocate mle entry
-    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, 0, eui64, true);
+    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, 0, eui64, true, &new_entry_created);
     if (!mle_entry) {
         return -1;
     }
@@ -282,7 +284,7 @@ int mac_pairwise_key_add(int8_t interface_id, uint32_t valid_life_time, const ui
     }
 
     //Set device descriptor
-    mac_helper_devicetable_set(mle_entry, interface, 0, interface->mac_parameters->mac_default_key_index);
+    mac_helper_devicetable_set(mle_entry, interface, 0, interface->mac_parameters->mac_default_key_index, new_entry_created);
 
     //set key descriptor
     if (mac_helper_security_pairwisekey_set(interface, key, eui64, key_desc->key_decriptor_attribute) != 0) {
@@ -308,7 +310,7 @@ int mac_pairwise_key_del(int8_t interface_id, const uint8_t eui64[static 8])
         return -1;
     }
     //Get from mle
-    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, 0, eui64, true);
+    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, 0, eui64, true, NULL);
     if (!mle_entry) {
         return -1;
     }