Merge branch 'release_internal' into release_external

* release_internal:
  Fixed Wi-SUN border router restart after settings change
  PAE authenticator TLS authentication limit based on dynamic value
  RPL config update not re-start whole BR again just increment version number and with new parameters.
  Fixed FHSS testing now it follow configured channel count not a wi-sun configured Default.
  Remove floating point literals from Thread code
  RPL link etx validation update

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -955,7 +955,7 @@ static void thread_interface_bootsrap_mode_init(protocol_interface_info_entry_t
         cur->thread_info->thread_device_mode = THREAD_DEVICE_MODE_SLEEPY_END_DEVICE;
         //SET Sleepy Host To RX on Idle mode for bootsrap
         nwk_thread_host_control(cur, NET_HOST_RX_ON_IDLE, 0);
-        cur->thread_info->childUpdateReqTimer = 0.8 * cur->thread_info->host_link_timeout;
+        cur->thread_info->childUpdateReqTimer = 8 * cur->thread_info->host_link_timeout / 10;
     } else {
         tr_debug("Set End node Mode");
         cur->thread_info->thread_device_mode = THREAD_DEVICE_MODE_END_DEVICE;

source/6LoWPAN/Thread/thread_common.c

@@ -381,7 +381,7 @@ void thread_key_guard_timer_calculate(protocol_interface_info_entry_t *cur, link
     }
 
     cur->thread_info->masterSecretMaterial.keyRotation = key_rotation * 3600; // setting value is hours converting to seconds
-    cur->thread_info->masterSecretMaterial.keySwitchGuardTimer = is_init ? 0 : (key_rotation * 3600 * 0.93);
+    cur->thread_info->masterSecretMaterial.keySwitchGuardTimer = is_init ? 0 : (key_rotation * 3600 * 93 / 100);
 }
 
 void thread_key_guard_timer_reset(protocol_interface_info_entry_t *cur)

source/6LoWPAN/Thread/thread_mle_message_handler.c

@@ -892,7 +892,7 @@ static void thread_parse_child_update_response(protocol_interface_info_entry_t *
 
     if (cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_SLEEPY_END_DEVICE) {
         if (cur->thread_info->childUpdateReqTimer < 1) {
-            cur->thread_info->childUpdateReqTimer = 0.8 * timeout;
+            cur->thread_info->childUpdateReqTimer = 8 * timeout / 10;
         }
     }
     //This process is ready

source/6LoWPAN/ws/ws_bootstrap.c

@@ -17,6 +17,7 @@
 
 #include <string.h>
 #include "nsconfig.h"
+#ifdef HAVE_WS
 #include "ns_types.h"
 #include "ns_trace.h"
 #include "net_interface.h"
@@ -38,6 +39,7 @@
 #include "RPL/rpl_protocol.h"
 #include "RPL/rpl_control.h"
 #include "RPL/rpl_data.h"
+#include "RPL/rpl_policy.h"
 #include "Common_Protocols/icmpv6.h"
 #include "Common_Protocols/icmpv6_radv.h"
 #include "Common_Protocols/ipv6_constants.h"
@@ -73,7 +75,7 @@
 
 #define TRACE_GROUP "wsbs"
 
-#ifdef HAVE_WS
+
 
 static void ws_bootstrap_event_handler(arm_event_s *event);
 static void ws_bootstrap_state_change(protocol_interface_info_entry_t *cur, icmp_state_t nwk_bootstrap_state);
@@ -522,6 +524,9 @@ static int8_t ws_fhss_initialize(protocol_interface_info_entry_t *cur)
             return 0;
         }
         fhss_configuration = *fhss_configuration_copy;
+        //Overwrite domain channel setup this will over write a default 35 channel
+        int num_of_channels = channel_list_count_channels(fhss_configuration_copy->unicast_channel_mask);
+        cur->ws_info->hopping_schdule.number_of_channels = (uint8_t) num_of_channels;
         memcpy(cur->ws_info->cfg->fhss.fhss_channel_mask, fhss_configuration_copy->unicast_channel_mask, sizeof(uint32_t) * 8);
         cur->ws_info->cfg->fhss.fhss_uc_channel_function = fhss_configuration_copy->ws_uc_channel_function;
         cur->ws_info->cfg->fhss.fhss_bc_channel_function = fhss_configuration_copy->ws_bc_channel_function;
@@ -2047,6 +2052,19 @@ int ws_bootstrap_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t
     return 0;
 }
 
+static int ws_bootstrap_set_domain_rf_config(protocol_interface_info_entry_t *cur)
+{
+    phy_rf_channel_configuration_s rf_configs;
+    rf_configs.channel_0_center_frequency = (uint32_t)cur->ws_info->hopping_schdule.ch0_freq * 100000;
+    rf_configs.channel_spacing = ws_decode_channel_spacing(cur->ws_info->hopping_schdule.channel_spacing);
+    rf_configs.datarate = ws_get_datarate_using_operating_mode(cur->ws_info->hopping_schdule.operating_mode);
+    rf_configs.modulation_index = ws_get_modulation_index_using_operating_mode(cur->ws_info->hopping_schdule.operating_mode);
+    rf_configs.modulation = M_2FSK;
+    rf_configs.number_of_channels = cur->ws_info->hopping_schdule.number_of_channels;
+    ws_bootstrap_set_rf_config(cur, rf_configs);
+    return 0;
+}
+
 static void ws_bootstrap_mac_activate(protocol_interface_info_entry_t *cur, uint16_t channel, uint16_t panid, bool coordinator)
 {
     mlme_start_t start_req;
@@ -2455,6 +2473,10 @@ static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
     if (cur->bootsrap_mode != ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
         rpl_control_set_memory_limits(WS_NODE_RPL_SOFT_MEM_LIMIT, WS_NODE_RPL_HARD_MEM_LIMIT);
     }
+    // Set RPL Link ETX Validation Threshold to 2.5 - 33.0
+    // This setup will set ETX 0x800 to report ICMP error 18% probability
+    // When ETX start go over 0x280 forward dropping probability start increase  linear to 100% at 0x2100
+    rpl_policy_forward_link_etx_threshold_set(0x280, 0x2100);
 
     // Set the minimum target refresh to sen DAO registrations before pan timeout
     rpl_control_set_minimum_dao_target_refresh(WS_RPL_DAO_MAX_TIMOUT);
@@ -2475,6 +2497,7 @@ static void ws_bootstrap_network_discovery_configure(protocol_interface_info_ent
     cur->ws_info->network_pan_id = 0xffff;
 
     ws_common_regulatory_domain_config(cur, &cur->ws_info->hopping_schdule);
+    ws_bootstrap_set_domain_rf_config(cur);
     ws_fhss_configure(cur, true);
 
     //Set Network names, Pan information configure, hopping schedule & GTKHash
@@ -2900,12 +2923,18 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
                 tr_info("Border router start network");
 
+
                 if (!ws_bbr_ready_to_start(cur)) {
                     // Wi-SUN not started yet we wait for Border router permission
                     ws_bootstrap_state_change(cur, ER_WAIT_RESTART);
                     cur->nwk_nd_re_scan_count = randLIB_get_random_in_range(40, 100);
                     return;
                 }
+                // Clear Old information from stack
+
+                ws_nud_table_reset(cur);
+                ws_bootstrap_neighbor_list_clean(cur);
+                ws_bootstrap_ip_stack_reset(cur);
                 ws_pae_controller_auth_init(cur);
 
                 // Randomize fixed channels. Only used if channel plan is fixed.
@@ -2928,9 +2957,10 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
                 ws_bbr_pan_version_increase(cur);
 
                 // Set default parameters for FHSS when starting a discovery
+                ws_common_regulatory_domain_config(cur, &cur->ws_info->hopping_schdule);
                 ws_fhss_border_router_configure(cur);
+                ws_bootstrap_set_domain_rf_config(cur);
                 ws_bootstrap_fhss_activate(cur);
-                ws_bootstrap_event_operation_start(cur);
 
                 uint8_t ll_addr[16];
                 addr_interface_get_ll_address(cur, ll_addr, 1);
@@ -2949,6 +2979,8 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
 
                 // Set PAE port to 10254 and authenticator relay to 10253 (and to own ll address)
                 ws_pae_controller_authenticator_start(cur, PAE_AUTH_SOCKET_PORT, ll_addr, EAPOL_RELAY_SOCKET_PORT);
+
+                ws_bootstrap_event_operation_start(cur);
                 break;
             }
             ws_pae_controller_supp_init(cur);

source/6LoWPAN/ws/ws_cfg_settings.c

@@ -273,19 +273,23 @@ int8_t ws_cfg_network_size_set(protocol_interface_info_entry_t *cur, ws_gen_cfg_
         nw_size_external_cfg = NULL;
     }
 
+    uint8_t set_flags = 0;
+    if (cfg->network_size == NETWORK_SIZE_AUTOMATIC) {
+        set_flags = CFG_FLAGS_DISABLE_VAL_SET;
+    }
     /* Sets values if changed or network size has been previously automatic (to make sure
        the settings are in sync */
     if (ws_cfg_timing_validate(&ws_cfg.timing, &nw_size_cfg.timing) == CFG_SETTINGS_CHANGED ||
             old_network_size == NETWORK_SIZE_AUTOMATIC) {
-        ws_cfg_timing_set(cur, &ws_cfg.timing, &nw_size_cfg.timing, 0);
+        ws_cfg_timing_set(cur, &ws_cfg.timing, &nw_size_cfg.timing, &set_flags);
     }
     if (ws_cfg_rpl_validate(&ws_cfg.rpl, &nw_size_cfg.rpl) == CFG_SETTINGS_CHANGED ||
             old_network_size == NETWORK_SIZE_AUTOMATIC) {
-        ws_cfg_rpl_set(cur, &ws_cfg.rpl, &nw_size_cfg.rpl, 0);
+        ws_cfg_rpl_set(cur, &ws_cfg.rpl, &nw_size_cfg.rpl, &set_flags);
     }
     if (ws_cfg_sec_prot_validate(&ws_cfg.sec_prot, &nw_size_cfg.sec_prot) == CFG_SETTINGS_CHANGED ||
             old_network_size == NETWORK_SIZE_AUTOMATIC) {
-        ws_cfg_sec_prot_set(cur, &ws_cfg.sec_prot, &nw_size_cfg.sec_prot, 0);
+        ws_cfg_sec_prot_set(cur, &ws_cfg.sec_prot, &nw_size_cfg.sec_prot, &set_flags);
     }
 
     // If is in an automatic network size mode, updates automatic configuration
@@ -355,6 +359,7 @@ static void ws_cfg_network_size_config_set_small(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_imax = SEC_PROT_SMALL_IMAX;
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
+    cfg->sec_prot.sec_max_ongoing_authentication = MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_SMALL;
 }
 
 static void ws_cfg_network_size_config_set_medium(ws_cfg_nw_size_t *cfg)
@@ -380,6 +385,7 @@ static void ws_cfg_network_size_config_set_medium(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_imax = SEC_PROT_SMALL_IMAX;
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
+    cfg->sec_prot.sec_max_ongoing_authentication = MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_MEDIUM;
 }
 
 static void ws_cfg_network_size_config_set_large(ws_cfg_nw_size_t *cfg)
@@ -405,6 +411,7 @@ static void ws_cfg_network_size_config_set_large(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_imax = SEC_PROT_LARGE_IMAX;
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_LARGE;
+    cfg->sec_prot.sec_max_ongoing_authentication = MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_LARGE;
 }
 
 static void ws_cfg_network_size_config_set_certificate(ws_cfg_nw_size_t *cfg)
@@ -430,6 +437,7 @@ static void ws_cfg_network_size_config_set_certificate(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_imax = SEC_PROT_SMALL_IMAX;
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
+    cfg->sec_prot.sec_max_ongoing_authentication = MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_SMALL;
 }
 
 static int8_t ws_cfg_gen_default_set(ws_gen_cfg_t *cfg)
@@ -721,10 +729,6 @@ int8_t ws_cfg_rpl_set(protocol_interface_info_entry_t *cur, ws_rpl_cfg_t *cfg, w
 
     *cfg = *new_cfg;
 
-    if (cur && !(cfg_flags & CFG_FLAGS_BOOTSTRAP_RESTART_DISABLE)) {
-        ws_bootstrap_restart_delayed(cur->id);
-    }
-
     return CFG_SETTINGS_OK;
 }
 
@@ -974,7 +978,7 @@ static int8_t ws_cfg_sec_prot_default_set(ws_sec_prot_cfg_t *cfg)
     cfg->sec_prot_trickle_imax = SEC_PROT_SMALL_IMAX;
     cfg->sec_prot_trickle_timer_exp = 2;
     cfg->sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
-
+    cfg->sec_max_ongoing_authentication = MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_MEDIUM;
     return CFG_SETTINGS_OK;
 }
 
@@ -994,7 +998,8 @@ int8_t ws_cfg_sec_prot_validate(ws_sec_prot_cfg_t *cfg, ws_sec_prot_cfg_t *new_c
     if (cfg->sec_prot_trickle_imin != new_cfg->sec_prot_trickle_imin ||
             cfg->sec_prot_trickle_imax != new_cfg->sec_prot_trickle_imax ||
             cfg->sec_prot_trickle_timer_exp != new_cfg->sec_prot_trickle_timer_exp ||
-            cfg->sec_prot_retry_timeout != new_cfg->sec_prot_retry_timeout) {
+            cfg->sec_prot_retry_timeout != new_cfg->sec_prot_retry_timeout ||
+            cfg->sec_max_ongoing_authentication != new_cfg->sec_max_ongoing_authentication) {
 
         return CFG_SETTINGS_CHANGED;
     }

source/6LoWPAN/ws/ws_cfg_settings.h

@@ -110,6 +110,7 @@ typedef struct ws_sec_prot_cfg_s {
     uint16_t sec_prot_trickle_imin;     /**< Security protocol trickle parameters Imin; seconds; default 30 */
     uint16_t sec_prot_trickle_imax;     /**< Security protocol trickle parameters Imax; seconds; default 90 */
     uint8_t sec_prot_trickle_timer_exp; /**< Security protocol trickle timer expirations; default 2 */
+    uint16_t sec_max_ongoing_authentication; /**< Pae authenticator max Accept ongoing authentication count */
 } ws_sec_prot_cfg_t;
 
 /**

source/6LoWPAN/ws/ws_common.c

@@ -59,7 +59,7 @@ int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_chann
     return 0;
 }
 
-static uint32_t ws_decode_channel_spacing(uint8_t channel_spacing)
+uint32_t ws_decode_channel_spacing(uint8_t channel_spacing)
 {
     if (CHANNEL_SPACING_100 == channel_spacing) {
         return 100000;
@@ -75,7 +75,7 @@ static uint32_t ws_decode_channel_spacing(uint8_t channel_spacing)
     return 0;
 }
 
-static uint32_t ws_get_datarate_using_operating_mode(uint8_t operating_mode)
+uint32_t ws_get_datarate_using_operating_mode(uint8_t operating_mode)
 {
     if ((OPERATING_MODE_1a == operating_mode) || (OPERATING_MODE_1b == operating_mode)) {
         return 50000;
@@ -91,7 +91,7 @@ static uint32_t ws_get_datarate_using_operating_mode(uint8_t operating_mode)
     return 0;
 }
 
-static phy_modulation_index_e ws_get_modulation_index_using_operating_mode(uint8_t operating_mode)
+phy_modulation_index_e ws_get_modulation_index_using_operating_mode(uint8_t operating_mode)
 {
     if ((OPERATING_MODE_1b == operating_mode) || (OPERATING_MODE_2b == operating_mode) || (OPERATING_MODE_4b == operating_mode)) {
         return MODULATION_INDEX_1_0;
@@ -100,21 +100,9 @@ static phy_modulation_index_e ws_get_modulation_index_using_operating_mode(uint8
     }
 }
 
-static int ws_set_domain_rf_config(protocol_interface_info_entry_t *cur)
-{
-    phy_rf_channel_configuration_s rf_configs;
-    rf_configs.channel_0_center_frequency = (uint32_t)cur->ws_info->hopping_schdule.ch0_freq * 100000;
-    rf_configs.channel_spacing = ws_decode_channel_spacing(cur->ws_info->hopping_schdule.channel_spacing);
-    rf_configs.datarate = ws_get_datarate_using_operating_mode(cur->ws_info->hopping_schdule.operating_mode);
-    rf_configs.modulation_index = ws_get_modulation_index_using_operating_mode(cur->ws_info->hopping_schdule.operating_mode);
-    rf_configs.modulation = M_2FSK;
-    rf_configs.number_of_channels = cur->ws_info->hopping_schdule.number_of_channels;
-    ws_bootstrap_set_rf_config(cur, rf_configs);
-    return 0;
-}
-
 int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur, ws_hopping_schedule_t *hopping_schdule)
 {
+    (void)cur;
     if (ws_get_datarate_using_operating_mode(hopping_schdule->operating_mode) == 0) {
         //Unsupported operation mode
         return -1;
@@ -201,10 +189,6 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur,
     if (!hopping_schdule->number_of_channels) {
         return -1;
     }
-
-    if (cur) {
-        ws_set_domain_rf_config(cur);
-    }
     return 0;
 }
 

source/6LoWPAN/ws/ws_common.h

@@ -114,6 +114,12 @@ typedef struct ws_info_s {
 
 int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_channels, uint8_t regulatory_domain);
 
+uint32_t ws_decode_channel_spacing(uint8_t channel_spacing);
+
+uint32_t ws_get_datarate_using_operating_mode(uint8_t operating_mode);
+
+phy_modulation_index_e ws_get_modulation_index_using_operating_mode(uint8_t operating_mode);
+
 int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur, ws_hopping_schedule_t *hopping_schdule);
 
 uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operating_class);

source/6LoWPAN/ws/ws_config.h

@@ -199,6 +199,11 @@ extern uint8_t DEVICE_MIN_SENS;
 
 #define SEC_PROT_TIMER_EXPIRATIONS 2        // Number of retries
 
+// Maximum number of simultaneous EAP-TLS negotiations
+#define MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_SMALL     3
+#define MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_MEDIUM    20
+#define MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS_LARGE       50
+
 /*
  *  Security protocol timer configuration parameters
  */

source/6LoWPAN/ws/ws_pae_auth.c

@@ -59,8 +59,6 @@
 // Wait for for supplicant to indicate activity (e.g. to send a message)
 #define WAIT_FOR_AUTHENTICATION_TICKS          5 * 60 * 10  // 5 minutes
 
-// Maximum number of simultaneous EAP-TLS negotiations
-#define MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS  3
 
 /* If EAP-TLS is delayed due to simultaneous negotiations limit, defines how
    long to wait for previous negotiation to complete */
@@ -941,7 +939,7 @@ static void ws_pae_auth_next_kmp_trigger(pae_auth_t *pae_auth, supp_entry_t *sup
            supplicant. Otherwise supplicant must re-send initial EAPOL-Key
            to try again using its trickle schedule */
         uint16_t ongoing_eap_tls_cnt = ws_pae_lib_supp_list_kmp_count(&pae_auth->active_supp_list, IEEE_802_1X_MKA);
-        if (ongoing_eap_tls_cnt >= MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS) {
+        if (ongoing_eap_tls_cnt >= pae_auth->sec_prot_cfg->sec_max_ongoing_authentication) {
             supp_entry->retry_ticks = EAP_TLS_NEGOTIATION_TRIGGER_TIMEOUT;
             tr_info("EAP-TLS max ongoing reached, count %i, delayed: eui-64: %s", ongoing_eap_tls_cnt, trace_array(supp_entry->addr.eui_64, 8));
             return;

source/6LoWPAN/ws/ws_pae_controller.c

@@ -603,6 +603,7 @@ int8_t ws_pae_controller_configure(protocol_interface_info_entry_t *interface_pt
         controller->sec_prot_cfg.sec_prot_trickle_params.k = 0;
         controller->sec_prot_cfg.sec_prot_trickle_params.TimerExpirations = sec_prot_cfg->sec_prot_trickle_timer_exp;
         controller->sec_prot_cfg.sec_prot_retry_timeout = sec_prot_cfg->sec_prot_retry_timeout * 10;
+        controller->sec_prot_cfg.sec_max_ongoing_authentication = sec_prot_cfg->sec_max_ongoing_authentication;
     }
 
     if (sec_timer_cfg) {

source/RPL/rpl_control.h

@@ -206,7 +206,6 @@ uint8_t rpl_policy_mrhof_parent_set_size_get(const rpl_domain_t *domain);
 #define rpl_control_address_register_done(interface, ll_addr, status) (false)
 #define rpl_policy_mrhof_parent_set_size_get(domain) (0)
 #define rpl_control_set_mrhof_parent_set_size(parent_set_size)
-
 #endif /* HAVE_RPL */
 
 #endif /* RPL_CONTROL_H_ */