Merge commit 'd2d0895795de64321d486208316838415ed80d65' into mbed-os-5.15

* commit 'd2d0895795de64321d486208316838415ed80d65':
  Squashed 'features/nanostack/sal-stack-nanostack/' changes from d879e6d..09d9e24

Author: Arto Kinnunen

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

@@ -204,6 +204,19 @@ void ws_test_skip_edfe_data_send(int8_t interface_id, bool skip);
  */
 int8_t  ws_test_drop_edfe_data_frames(int8_t interface_id, uint8_t number_of_dropped_frames);
 
+/**
+ * Set neighbour temporary timeout value.
+ *
+ * Made only for test purpose for test EDFE certificatiomn test harness.
+ *
+ * \param interface_id Network interface ID.
+ * \param temporary_lifetime 0 to disable test harness, 240-2200 enable longer temporary neighbour lifetime. Values bigger than 2200 will be capped to 2200.
+ *
+ * \return 0                        Success
+ * \return <0                       Failure
+ */
+int ws_test_neighbour_temporary_lifetime_set(int8_t interface_id, uint32_t temporary_lifetime);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -97,6 +97,7 @@ int ws_bbr_start(int8_t interface_id, int8_t backbone_interface_id);
 #define BBR_BB_WAIT               0x0004 /**< Wait backbone availability before starting Wi-SUN network */
 #define BBR_DEFAULT_ROUTE         0x0008 /**< Add default route parameter to DIO */
 #define BBR_REQUIRE_DAO_REFRESH   0x0010 /**< Do not increment PAN version number when active forces DAO update from nodes*/
+#define BBR_GUA_SLAAC             0x0020 /**< in Global prefix use SLAAC address generation to reduce traffic during bootstrap */
 
 /**
  * Configure border router features.

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api.c

@@ -492,6 +492,8 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
 
     uint8_t local_prefix[8] = {0};
     uint8_t global_prefix[8] = {0};
+    uint8_t prefix_flags = 0;
+    uint32_t prefix_lifetime = 0;
 
     //tr_info("BBR status check");
 
@@ -596,7 +598,6 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
         }
         // TODO add global prefix
         if (memcmp(global_prefix, ADDR_UNSPECIFIED, 8) != 0) {
-
             tr_info("RPL global prefix activate %s", trace_ipv6_prefix(global_prefix, 64));
             // Add default route to RPL
             // Enable default routing to backbone
@@ -606,8 +607,12 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
                     return;
                 }
             }
+            if (configuration & BBR_GUA_SLAAC) {
+                prefix_flags |= PIO_A;
+                prefix_lifetime = WS_ULA_LIFETIME;
+            }
             ws_bbr_dhcp_server_start(cur, global_prefix, cur->ws_info->cfg->bbr.dhcp_address_lifetime);
-            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_prefix, 64, 0, 0, 0, false);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_prefix, 64, prefix_flags, prefix_lifetime, prefix_lifetime, false);
             // no check for failure should have
 
             if (configuration & BBR_GUA_ROUTE) {
@@ -626,7 +631,11 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
          *  There is no status checks on prefix adds so this makes sure they are not lost
          *  DHCP validation should be done also
          */
-        rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, current_global_prefix, 64, 0, 0, 0, false);
+        if (configuration & BBR_GUA_SLAAC) {
+            prefix_flags |= PIO_A;
+            prefix_lifetime = WS_ULA_LIFETIME;
+        }
+        rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, current_global_prefix, 64, prefix_flags, prefix_lifetime, prefix_lifetime, false);
 
         if (configuration & BBR_GUA_ROUTE) {
             // Add also global prefix and route to RPL

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.c

@@ -55,6 +55,7 @@ typedef struct ws_cfg_nw_size_s {
     ws_sec_prot_cfg_t sec_prot;         /**< Security protocols configuration */
 } ws_cfg_nw_size_t;
 
+static uint32_t ws_test_temporary_entry_lifetime = 0;
 typedef int8_t (*ws_cfg_default_set)(void *cfg);
 typedef int8_t (*ws_cfg_validate)(void *cfg, void *new_cfg);
 typedef int8_t (*ws_cfg_set)(protocol_interface_info_entry_t *cur, void *cfg, void *new_cfg, uint8_t *flags);
@@ -86,11 +87,8 @@ static void ws_cfg_network_size_config_set_xlarge(ws_cfg_nw_size_t *cfg);
 static void ws_cfg_network_size_config_set_certificate(ws_cfg_nw_size_t *cfg);
 static int8_t ws_cfg_network_size_default_set(ws_gen_cfg_t *cfg);
 static int8_t ws_cfg_gen_default_set(ws_gen_cfg_t *cfg);
-static int8_t ws_cfg_phy_default_set(ws_phy_cfg_t *cfg);
-static int8_t ws_cfg_timing_default_set(ws_timing_cfg_t *cfg);
 static int8_t ws_cfg_bbr_default_set(ws_bbr_cfg_t *cfg);
 static int8_t ws_cfg_mpl_default_set(ws_mpl_cfg_t *cfg);
-static int8_t ws_cfg_fhss_default_set(ws_fhss_cfg_t *cfg);
 static int8_t ws_cfg_sec_timer_default_set(ws_sec_timer_cfg_t *cfg);
 static int8_t ws_cfg_sec_prot_default_set(ws_sec_prot_cfg_t *cfg);
 
@@ -600,7 +598,7 @@ int8_t ws_cfg_gen_set(protocol_interface_info_entry_t *cur, ws_gen_cfg_t *cfg, w
     return CFG_SETTINGS_OK;
 }
 
-static int8_t ws_cfg_phy_default_set(ws_phy_cfg_t *cfg)
+int8_t ws_cfg_phy_default_set(ws_phy_cfg_t *cfg)
 {
     // FHSS configuration
     cfg->regulatory_domain = REG_DOMAIN_EU;
@@ -680,7 +678,7 @@ int8_t ws_cfg_phy_set(protocol_interface_info_entry_t *cur, ws_phy_cfg_t *cfg, w
     return CFG_SETTINGS_OK;
 }
 
-static int8_t ws_cfg_timing_default_set(ws_timing_cfg_t *cfg)
+int8_t ws_cfg_timing_default_set(ws_timing_cfg_t *cfg)
 {
     // Configure the Wi-SUN timing trickle parameters
     cfg->disc_trickle_imin = TRICKLE_IMIN_60_SECS;       // 60 seconds
@@ -900,7 +898,7 @@ int8_t ws_cfg_mpl_set(protocol_interface_info_entry_t *cur, ws_mpl_cfg_t *cfg, w
     return CFG_SETTINGS_OK;
 }
 
-static int8_t ws_cfg_fhss_default_set(ws_fhss_cfg_t *cfg)
+int8_t ws_cfg_fhss_default_set(ws_fhss_cfg_t *cfg)
 {
     // Set defaults for the device. user can modify these.
     cfg->fhss_uc_fixed_channel = 0xffff;
@@ -1275,4 +1273,21 @@ int8_t ws_cfg_settings_set(protocol_interface_info_entry_t *cur, ws_cfg_t *new_c
     return ret_value;
 }
 
+uint32_t ws_cfg_neighbour_temporary_lifetime_get(void)
+{
+    if (ws_test_temporary_entry_lifetime) {
+        return ws_test_temporary_entry_lifetime;
+    }
+    return WS_NEIGHBOUR_TEMPORARY_ENTRY_LIFETIME;
+}
+void ws_cfg_neighbour_temporary_lifetime_set(uint32_t lifetime)
+{
+    if (lifetime >= WS_NEIGHBOUR_TEMPORARY_NEIGH_MAX_LIFETIME || lifetime == 0) {
+        if (lifetime > WS_NEIGHBOR_LINK_TIMEOUT) {
+            lifetime = WS_NEIGHBOR_LINK_TIMEOUT;
+        }
+        ws_test_temporary_entry_lifetime = lifetime;
+    }
+}
+
 #endif //HAVE_WS

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.c

@@ -159,10 +159,12 @@ int8_t ws_cfg_gen_get(ws_gen_cfg_t *cfg, uint8_t *flags);
 int8_t ws_cfg_gen_validate(ws_gen_cfg_t  *cfg, ws_gen_cfg_t  *new_cfg);
 int8_t ws_cfg_gen_set(protocol_interface_info_entry_t *cur, ws_gen_cfg_t *cfg, ws_gen_cfg_t *new_cfg, uint8_t *flags);
 
+int8_t ws_cfg_phy_default_set(ws_phy_cfg_t *cfg);
 int8_t ws_cfg_phy_get(ws_phy_cfg_t *cfg, uint8_t *flags);
 int8_t ws_cfg_phy_validate(ws_phy_cfg_t *cfg, ws_phy_cfg_t *new_cfg);
 int8_t ws_cfg_phy_set(protocol_interface_info_entry_t *cur, ws_phy_cfg_t *cfg, ws_phy_cfg_t *new_cfg, uint8_t *flags);
 
+int8_t ws_cfg_timing_default_set(ws_timing_cfg_t *cfg);
 int8_t ws_cfg_timing_get(ws_timing_cfg_t *cfg, uint8_t *flags);
 int8_t ws_cfg_timing_validate(ws_timing_cfg_t *cfg, ws_timing_cfg_t *new_cfg);
 int8_t ws_cfg_timing_set(protocol_interface_info_entry_t *cur, ws_timing_cfg_t *cfg, ws_timing_cfg_t *new_cfg, uint8_t *flags);
@@ -175,6 +177,7 @@ int8_t ws_cfg_mpl_get(ws_mpl_cfg_t *cfg, uint8_t *flags);
 int8_t ws_cfg_mpl_validate(ws_mpl_cfg_t *cfg, ws_mpl_cfg_t *new_cfg);
 int8_t ws_cfg_mpl_set(protocol_interface_info_entry_t *cur, ws_mpl_cfg_t *cfg, ws_mpl_cfg_t *new_cfg, uint8_t *flags);
 
+int8_t ws_cfg_fhss_default_set(ws_fhss_cfg_t *cfg);
 int8_t ws_cfg_fhss_get(ws_fhss_cfg_t *cfg, uint8_t *flags);
 int8_t ws_cfg_fhss_validate(ws_fhss_cfg_t *cfg, ws_fhss_cfg_t *new_cfg);
 int8_t ws_cfg_fhss_set(protocol_interface_info_entry_t *cur, ws_fhss_cfg_t *cfg, ws_fhss_cfg_t *new_cfg, uint8_t *flags);
@@ -187,4 +190,7 @@ int8_t ws_cfg_sec_prot_get(ws_sec_prot_cfg_t *cfg, uint8_t *flags);
 int8_t ws_cfg_sec_prot_validate(ws_sec_prot_cfg_t *cfg, ws_sec_prot_cfg_t *new_cfg);
 int8_t ws_cfg_sec_prot_set(protocol_interface_info_entry_t *cur, ws_sec_prot_cfg_t *cfg, ws_sec_prot_cfg_t *new_cfg, uint8_t *flags);
 
+uint32_t ws_cfg_neighbour_temporary_lifetime_get(void);
+void ws_cfg_neighbour_temporary_lifetime_set(uint32_t lifetime);
+
 #endif // WS_CFG_STORAGE_H_

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.h

@@ -390,6 +390,24 @@ uint8_t ws_common_temporary_entry_size(uint8_t mac_table_size)
     }
 }
 
+static void ws_common_neighbour_address_reg_link_update(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
+{
+    /*
+     * ARO registration from child can update the link timeout so we don't need to send extra NUD if ARO received
+     */
+    mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_entry_get_by_mac64(mac_neighbor_info(interface), eui64, false, false);
+
+    if (mac_neighbor) {
+        if (mac_neighbor->link_lifetime != WS_NEIGHBOR_LINK_TIMEOUT) {
+            //Set Stable timeout for temporary entry here
+            mac_neighbor->link_lifetime = WS_NEIGHBOR_LINK_TIMEOUT;
+            tr_info("Added new neighbor %s : index:%u", trace_array(eui64, 8), mac_neighbor->index);
+        }
+        //Refresh
+        mac_neighbor->lifetime = mac_neighbor->link_lifetime;
+    }
+}
+
 uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
 {
     uint8_t child_count = 0;
@@ -402,14 +420,7 @@ uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *inte
 
     //Validate Is EUI64 already allocated for any address
     if (ipv6_neighbour_has_registered_by_eui64(&interface->ipv6_neighbour_cache, eui64)) {
-        /*
-         * ARO registration from child can update the link timeout so we don't need to send extra NUD if ARO received
-         */
-        mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_entry_get_by_mac64(mac_neighbor_info(interface), eui64, false, false);
-
-        if (mac_neighbor) {
-            mac_neighbor_table_neighbor_refresh(mac_neighbor_info(interface), mac_neighbor, mac_neighbor->link_lifetime);
-        }
+        ws_common_neighbour_address_reg_link_update(interface, eui64);
         tr_info("Child registration from old child");
         return ARO_SUCCESS;
     }
@@ -431,7 +442,8 @@ uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *inte
         tr_warn("Child registration not allowed %d/%d, max:%d", child_count, max_child_count, mac_neighbor_info(interface)->list_total_size);
         return ARO_FULL;
     }
-    ws_bootstrap_neighbor_set_stable(interface, eui64);
+
+    ws_common_neighbour_address_reg_link_update(interface, eui64);
     tr_info("Child registration allowed %d/%d, max:%d", child_count, max_child_count, mac_neighbor_info(interface)->list_total_size);
     return ARO_SUCCESS;
 }

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.c

@@ -42,6 +42,7 @@ typedef struct parent_info_s {
     uint16_t             pan_id;             /**< PAN ID */
     uint8_t              addr[8];            /**< address */
     uint8_t              link_quality;       /**< LQI value measured during reception of the MPDU */
+    uint8_t              tx_fail;
     int8_t               signal_dbm;         /**< This extension for normal IEEE 802.15.4 Data indication */
     ws_pan_information_t pan_information;
     ws_utt_ie_t          ws_utt;

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.h

@@ -241,6 +241,7 @@ typedef struct ws_bs_ie {
 
 #define WS_NEIGHBOR_LINK_TIMEOUT 2200
 
+#define WS_NEIGHBOUR_TEMPORARY_NEIGH_MAX_LIFETIME 240
 #define WS_NEIGHBOUR_TEMPORARY_ENTRY_LIFETIME 5
 #define WS_NEIGHBOUR_DHCP_ENTRY_LIFETIME 60
 #define WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT_LARGE 520
@@ -254,7 +255,8 @@ typedef struct ws_bs_ie {
 #define WS_NEIGHBOR_ETX_SAMPLE_MAX 3
 #define WS_NEIGHBOR_FIRST_ETX_SAMPLE_MIN_COUNT 3 //This can't be bigger than WS_NEIGHBOR_ETX_SAMPLE_MAX
 
-#define WS_PROBE_INIT_BASE_SECONDS 8
+#define WS_SMALL_PROBE_INIT_BASE_SECONDS 4
+#define WS_NORMAL_PROBE_INIT_BASE_SECONDS 8
 
 #define WS_NUD_RAND_PROBABILITY 1
 
@@ -269,6 +271,10 @@ typedef struct ws_bs_ie {
 
 #define WS_ETX_MIN_WAIT_TIME 60
 
+#define WS_ETX_BAD_INIT_LINK_LEVEL 3 //3 or higher attempt count will be dropped
+#define WS_ETX_MAX_BAD_LINK_DROP 2 //Drop 2 bad link from init 3
+
+
 #define WS_RPL_PARENT_CANDIDATE_MAX 5
 #define WS_RPL_SELECTED_PARENT_MAX 2
 
@@ -321,8 +327,12 @@ typedef struct ws_bs_ie {
  * 3                        4                               1+3*1+4=20
  *
  */
+// This configuration is used when bootstrap is ready
 #define WS_MAX_FRAME_RETRIES            3
 #define WS_NUMBER_OF_CHANNEL_RETRIES    4
+// This configuration is used during bootstrap
+#define WS_MAX_FRAME_RETRIES_BOOTSTRAP          0
+#define WS_NUMBER_OF_CHANNEL_RETRIES_BOOTSTRAP  19
 
 
 #if (1 + WS_MAX_FRAME_RETRIES) * (1 + WS_NUMBER_OF_CHANNEL_RETRIES) < 20

features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common_defines.h

@@ -174,8 +174,8 @@ extern uint8_t DEVICE_MIN_SENS;
 #define FRAME_COUNTER_STORE_INTERVAL        60          // Time interval (on seconds) between checking if frame counter storing is needed
 #define FRAME_COUNTER_STORE_FORCE_INTERVAL  (3600 * 20) // Time interval (on seconds) before frame counter storing is forced (if no other storing operations triggered)
 #define FRAME_COUNTER_STORE_TRIGGER         5           // Delay (on seconds) before storing, when storing of frame counters is triggered
-#define FRAME_COUNTER_INCREMENT             1000        // How much frame counter is incremented on start up
-#define FRAME_COUNTER_STORE_THRESHOLD       800         // How much frame counter must increment before it is stored
+#define FRAME_COUNTER_INCREMENT             1000000     // How much frame counter is incremented on start up
+#define FRAME_COUNTER_STORE_THRESHOLD       994999      // How much frame counter must increment before it is stored
 
 
 /*
@@ -219,7 +219,7 @@ extern uint8_t DEVICE_MIN_SENS;
 #define SEC_PROT_TIMER_EXPIRATIONS 2        // Number of retries
 
 // Maximum number of simultaneous security negotiations
-#define MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_SMALL     3
+#define MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_SMALL     20
 #define MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_MEDIUM    20
 #define MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_LARGE     50