Squashed 'features/nanostack/sal-stack-nanostack/' changes from 0345477..3c7d50e

3c7d50e Remove test files
d5f5bee Merge branch 'release_internal' into release_external
72b065b Merge pull request ARMmbed#2133 from ARMmbed/few_updates
1da0b9f Fix unittest cleanup
d173249 Adjust GC cleanup threshold and traces
26166d1 Remove ns_sw_mac_packet_ingress_rate_limit_by_mem (ARMmbed#2132)
5305754 Merge pull request ARMmbed#2130 from ARMmbed/IOTTHD-3419
038bc2e Copy ingress rate limiting API to ns_conf
940b516 Fix compiler warnings
64e6ff3 Review corrections
01e7d84 Update GC thresholds, init and traces
1acd1cc Add unit tests for monitor
64c969e Nanostack heap garbage collection
d3330b2 Fix errors found by Coverity (ARMmbed#2131)
da5d2c7 MAC, RPL and ETX trace clean.
eaf8907 Limit amount of incoming packet based on memory (ARMmbed#2128)
0c2b383 Fixed unitest header size compare value for support brodacst shedule.
6c70262 Wi-sun LLC update
7c57343 WS PAN Config handler update
161421b Wi-sun PAN_VERSION lifetime and timeout update
43083ed Fixed broken wi-sun neigbour black list filtering.
0992ee2 Update Pan information data from all selected parent.
cafc142 Fixed Pan advertisment route cost comapre for consistent and incosistent
db81d02 SW MAC timestamp read update
eddf91b Wi-sun neighbor generate limitation
4d6abb3 Added 15 second guarantee time for packet handler before remove link.
9ed97eb SW MAC new API for read current timestamp
6a44829 Stop advertisment RPL prefix if we not have a address and it is not 'A-flag'
d37ce6a Revert "Wi-sun dublicate MPX ID filter support"
d80ebf8 Fix debug trace format.
b1ef0f6 Removed Address reg pending and rady mask from address.
ce672ba Added trace for debugging DHCPv6 failure reason.
aaf2b39 Wi-sun dublicate MPX ID filter support
bd51f9f Merge pull request ARMmbed#2117 from ARMmbed/IOTTHD-3587
b016d52 Fixed DHCPv6 client delete when address was removed to new network discovery.
69fb24b Wi-sun address registration and RPL update
92d3a92 RPL: trace new preferred parent
9a6e4e0 disable multicast NS for wisun
6e13d81 Merge pull request ARMmbed#2113 from ARMmbed/IOTTHD-3577
85aaae7 Refactored the Wi-SUN BBR logic according to design
61f6f5b WS: Added ws stats empty functions
ac191c3 Removed link local address verifycation and dead code.
77076d1 Negative ARO timeout use same timeout than not trusted device.
c4e8735 Wi-sun DHCP solicit max to 15min from 60min.
66615e6 Updated wi-sun BBR min hop rank increase to 196.
9ce41f1 Pendig address registration will move DAO send.
f54ea6b Merge pull request ARMmbed#2110 from ARMmbed/IOTTHD-3577
18dbac2 WS: Implemented ws statistics
3ce95fa FHSS WS: Fixed drift compensation stats
b878bd9 KMP address update
7f18afe PAE controller and NVM update
f692eb8 Wi-SUN border router configure update
386e5ff Wi-sun Update
05b1fe8 do not send periodic DIO messages if DAO registration is not done
6acee47 modified RSL calculation and value in messaging
ee7f218 Modify discovery start timing
1ba806d Wi-SUN NUD send fix
31fb8cd Moved counter config to config.h
cf18063 Added storing of MAC frame counter to NVM
68adb36 Neighbor cache update
8cdd961 Added possibility for Update DHCPv6 client server address.
2dfa536 Merge pull request ARMmbed#2099 from ARMmbed/IOTTHD-3231
8dc200b FHSS: Created statistics for WS
5e67f7c RPL update
bbae493 wi-sun RPL param update
e8567d7 MAC neighbour remove and add trace simplify.
8bb4ab5 Cleaned unnessary debug trace.
3608153 DIO prefix handler update
332735b Disabled Version number periodic update if Dodag max rank inrease is not 0.
940de0b Wi-SUN setup update:
c1a89e5 Merge pull request ARMmbed#2095 from ARMmbed/IOTTHD-3474
f6d81b5 Review corrections
7487ca1 Fix clang-6.0 build error and warnings
cce3fc7 Security protocols are no longer started second time on authenticator

git-subtree-dir: features/nanostack/sal-stack-nanostack
git-subtree-split: 3c7d50e

Author: Arto Kinnunen

Makefile

@@ -65,6 +65,7 @@ $(TESTDIRS):
 
 $(CLEANTESTDIRS):
 	@make -C $(@:clean-%=%) clean
+	@rm -fr results
 
 .PHONY: release
 release:

nanostack/fhss_config.h

@@ -183,6 +183,12 @@ typedef struct fhss_statistics {
 
     /** FHSS synchronization lost counter. */
     uint32_t fhss_synch_lost;
+
+    /** FHSS TX to unknown neighbour counter. */
+    uint32_t fhss_unknown_neighbor;
+
+    /** FHSS channel retry counter. */
+    uint32_t fhss_channel_retry;
 } fhss_statistics_t;
 
 /**

nanostack/net_fhss.h

@@ -76,6 +76,14 @@ extern int ns_fhss_ws_configuration_set(const fhss_api_t *fhss_api, const fhss_w
  */
 extern int ns_fhss_delete(fhss_api_t *fhss_api);
 
+/**
+ * @brief Starts collecting FHSS statistics.
+ * @param fhss_api FHSS instance.
+ * @param fhss_statistics Pointer to stored statistics.
+ * @return 0 on success, -1 on fail.
+ */
+extern int ns_fhss_statistics_start(const fhss_api_t *fhss_api, fhss_statistics_t *fhss_statistics);
+
 
 #ifdef __cplusplus
 }

nanostack/ns_conf.h

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _NS_CONF_H_
+#define _NS_CONF_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \file ns_conf.h
+ * \brief Nanostack configuration API.
+ */
+
+/**
+ * \brief Set threshold for memory garbage collection.
+ *
+ *  Nanostack heap usage is monitored in regular intervals. If too much memory has been used then garbage collection (GC)
+ *  is triggered. GC has two adjustable thresholds: HIGH and CRITICAL. HIGH threshold is lower one and once exceeded
+ *  a GC will try to release memory that is used for caching. When CRITTICAL threshold is exceeded them GC will try to release
+ *  memory more aggressiveliy.
+ *
+ *  Nanostack memory monitoring can only work if memory statistics are enabled in nsdynmemLIB.
+
+ *
+ * \param percentage_high       Percentage of total heap when garbage collection is first time triggered
+ * \param percentage_critical   Percentage of total heap when critical garbage collection is triggered
+ *
+ * \return 0 in success, negative value in case of error.
+ *
+ */
+int ns_conf_gc_threshold_set(uint8_t percentage_high, uint8_t percentage_critical);
+
+/**
+ * \brief Limit amount of incoming packets if system does not have enough free memory.
+ * Memory statistics must been initialized in nsdynmemLIB to get this feature working.
+ *
+ * \param free_heap_percentage Percentage of free heap that must be available when packet arrives to MAC layer.
+ * \return 0 in case of success, <0 otherwise.
+ */
+int ns_conf_packet_ingress_rate_limit_by_mem(uint8_t free_heap_percentage);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _NS_CONF_H_ */

nanostack/ns_file_system.h

@@ -18,6 +18,10 @@
 #ifndef _NS_FILE_SYSTEM_H_
 #define _NS_FILE_SYSTEM_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \file ns_file_system.h
  * \brief Nanostack file system API.
@@ -35,9 +39,7 @@
  * \return 0 in success, negative value in case of error.
  *
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
+
 int ns_file_system_set_root_path(const char *root_path);
 
 /**
@@ -47,6 +49,7 @@ int ns_file_system_set_root_path(const char *root_path);
  *
  */
 char *ns_file_system_get_root_path(void);
+
 #ifdef __cplusplus
 }
 #endif

nanostack/sw_mac.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,6 +81,13 @@ extern struct fhss_api *ns_sw_mac_get_fhss_api(struct mac_api_s *mac_api);
  */
 extern int ns_sw_mac_statistics_start(struct mac_api_s *mac_api, struct mac_statistics_s *mac_statistics);
 
+/**
+ * @brief Read current timestamp.
+ * @param mac_api MAC instance.
+ * @return Current timestamp in us
+ */
+extern uint32_t ns_sw_mac_read_current_timestamp(struct mac_api_s *mac_api);
+
 #ifdef __cplusplus
 }
 #endif

nanostack/ws_management_api.h

@@ -77,6 +77,7 @@ extern "C" {
 
 #define NETWORK_SIZE_AUTOMATIC 0x00
 #define NETWORK_SIZE_SMALL 0x01
+#define NETWORK_SIZE_MEDIUM 0x08
 #define NETWORK_SIZE_LARGE 0x10
 
 
@@ -85,6 +86,16 @@ extern "C" {
  */
 #define WS_MANAGEMENT_API_VER_2
 
+/**
+ * \brief Struct ws_statistics defines the Wi-SUN statistics storage structure.
+ */
+typedef struct ws_statistics {
+    /** Asynch TX counter */
+    uint32_t asynch_tx_count;
+    /** Asynch RX counter */
+    uint32_t asynch_rx_count;
+} ws_statistics_t;
+
 /**
  * Initialize Wi-SUN stack.
  *
@@ -255,6 +266,30 @@ int ws_management_fhss_broadcast_channel_function_configure(
     uint8_t dwell_interval,
     uint32_t broadcast_interval);
 
+/**
+ * Start collecting Wi-SUN statistics.
+ *
+ * \param interface_id Network interface ID.
+ * \param stats_ptr Pointer to stored statistics.
+ *
+ * \return 0 Success.
+ * \return <0 Failure.
+ */
+int ws_statistics_start(
+    int8_t interface_id,
+    ws_statistics_t *stats_ptr);
+
+/**
+ * Stop collecting Wi-SUN statistics.
+ *
+ * \param interface_id Network interface ID.
+ *
+ * \return 0 Success.
+ * \return <0 Failure.
+ */
+int ws_statistics_stop(
+    int8_t interface_id);
+
 #ifdef __cplusplus
 }
 #endif

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -1605,7 +1605,7 @@ static void lowpan_neighbor_entry_remove_notify(mac_neighbor_table_entry_t *entr
         protocol_6lowpan_release_short_link_address_from_neighcache(cur_interface, entry_ptr->mac16);
         protocol_6lowpan_release_long_link_address_from_neighcache(cur_interface, entry_ptr->mac64);
     }
-    mac_helper_devicetable_remove(cur_interface->mac_api, entry_ptr->index);
+    mac_helper_devicetable_remove(cur_interface->mac_api, entry_ptr->index, entry_ptr->mac64);
     //Removes ETX neighbor
     etx_neighbor_remove(cur_interface->id, entry_ptr->index);
     //Remove MLE frame counter info

source/6LoWPAN/MAC/mac_helper.c

@@ -866,7 +866,7 @@ int8_t mac_helper_link_frame_counter_set(int8_t interface_id, uint32_t seq_ptr)
     return 0;
 }
 
-void mac_helper_devicetable_remove(mac_api_t *mac_api, uint8_t attribute_index)
+void mac_helper_devicetable_remove(mac_api_t *mac_api, uint8_t attribute_index, uint8_t *mac64)
 {
     if (!mac_api) {
         return;
@@ -880,7 +880,7 @@ void mac_helper_devicetable_remove(mac_api_t *mac_api, uint8_t attribute_index)
     set_req.attr_index = attribute_index;
     set_req.value_pointer = (void *)&device_desc;
     set_req.value_size = sizeof(mlme_device_descriptor_t);
-    tr_debug("unRegister Device");
+    tr_debug("Unregister Device %u, mac64: %s", attribute_index, trace_array(mac64, 8));
     mac_api->mlme_req(mac_api, MLME_SET, &set_req);
 }
 
@@ -910,7 +910,7 @@ void mac_helper_devicetable_set(const mlme_device_descriptor_t *device_desc, pro
     set_req.attr_index = attribute_index;
     set_req.value_pointer = (void *)device_desc;
     set_req.value_size = sizeof(mlme_device_descriptor_t);
-    tr_debug("Register Device");
+    tr_debug("Register Device %u, mac16 %x mac64: %s, %"PRIu32, attribute_index, device_desc->ShortAddress, trace_array(device_desc->ExtAddress, 8), device_desc->FrameCounter);
     cur->mac_api->mlme_req(cur->mac_api, MLME_SET, &set_req);
 }
 

source/6LoWPAN/MAC/mac_helper.h

@@ -115,7 +115,7 @@ int8_t mac_helper_link_frame_counter_read(int8_t interface_id, uint32_t *seq_ptr
 
 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_remove(struct mac_api_s *mac_api, uint8_t attribute_index, uint8_t *mac64);
 
 void mac_helper_device_description_write(struct protocol_interface_info_entry *cur, mlme_device_descriptor_t *device_desc, uint8_t *mac64, uint16_t mac16, uint32_t frame_counter, bool exempt);
 

source/6LoWPAN/ND/nd_router_object.c

@@ -855,8 +855,14 @@ static void nd_update_registration(protocol_interface_info_entry_t *cur_interfac
          */
         mac_neighbor_table_entry_t *entry = mac_neighbor_table_address_discover(mac_neighbor_info(cur_interface), ipv6_neighbour_eui64(&cur_interface->ipv6_neighbour_cache, neigh), ADDR_802_15_4_LONG);
 
-        if (entry && !entry->ffd_device) {
-            rpl_control_publish_host_address(protocol_6lowpan_rpl_domain, neigh->ip_address, neigh->lifetime);
+        if (entry) {
+            if (ws_info(cur_interface)) {
+                ws_common_etx_validate(cur_interface, entry);
+            }
+
+            if (!entry->ffd_device) {
+                rpl_control_publish_host_address(protocol_6lowpan_rpl_domain, neigh->ip_address, neigh->lifetime);
+            }
         }
         protocol_6lowpan_neighbor_address_state_synch(cur_interface, aro->eui64, neigh->ip_address + 8);
 

source/6LoWPAN/Thread/thread_common.c

@@ -2015,7 +2015,7 @@ void thread_reset_neighbour_info(protocol_interface_info_entry_t *cur, mac_neigh
     thread_routing_remove_link(cur, neighbour->mac16);
     thread_router_bootstrap_reset_child_info(cur, neighbour);
     protocol_6lowpan_release_long_link_address_from_neighcache(cur, neighbour->mac64);
-    mac_helper_devicetable_remove(cur->mac_api, neighbour->index);
+    mac_helper_devicetable_remove(cur->mac_api, neighbour->index, neighbour->mac64);
     thread_neighbor_class_entry_remove(&cur->thread_info->neighbor_class, neighbour->index);
 }