Fixed Wi-SUN border router restart after settings change

Moved RF configuration function to separate calls from setting change
called configurations from bootstrap

Added cleanup functions to restart

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2052,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;
@@ -2484,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
@@ -2909,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.
@@ -2937,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);
@@ -2958,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_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);