Merge pull request #2053 from ARMmbed/ws_eapol_bootstrap

Ws eapol bootstrap

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -988,7 +988,6 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     ws_bs_ie_t ws_bs_ie;
     uint8_t *gtkhash_ptr;
 
-
     if (data->SrcPANId != cur->ws_info->network_pan_id) {
         tr_debug("Wrong PAN id r:%u own:%u", data->SrcPANId, cur->ws_info->network_pan_id);
         return;
@@ -1974,7 +1973,6 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
 // Start authentication
 static void ws_bootstrap_start_authentication(protocol_interface_info_entry_t *cur)
 {
-    tr_debug("authentication start");
     // Set PAN ID and network name to controller
     ws_pae_controller_nw_info_set(cur, cur->ws_info->network_pan_id, cur->ws_info->network_name);
 
@@ -2538,7 +2536,12 @@ void ws_bootstrap_trickle_timer(protocol_interface_info_entry_t *cur, uint16_t t
         // send PAN Configuration solicit
         if (cur->ws_info->pas_requests > PCS_MAX) {
             // if MAX PCS sent restart discovery
+            uint8_t empty_key[32];
+            memset(empty_key, 0, 32);
             tr_debug("Restart???");
+            //Clear Key's
+            tr_debug("Remove not working GTK's");
+            ws_pae_controller_gtk_hash_update(cur, empty_key);
             ws_bootstrap_event_discovery_start(cur);
             return;
         }

source/Service_Libs/fhss/fhss_ws.c

@@ -225,6 +225,7 @@ static void fhss_broadcast_handler(const fhss_api_t *fhss_api, uint16_t delay)
     if (fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval == 0 || fhss_structure->ws->fhss_configuration.fhss_broadcast_interval == 0) {
         // stop broadcast schedule
         fhss_structure->ws->is_on_bc_channel = false;
+        fhss_structure->ws->synchronization_time = 0;
         return;
     }
     if (fhss_structure->ws->is_on_bc_channel == false) {
@@ -885,6 +886,10 @@ int fhss_ws_configuration_set(fhss_structure_t *fhss_structure, const fhss_ws_co
         fhss_stop_timer(fhss_structure, fhss_unicast_handler);
         fhss_structure->ws->unicast_timer_running = false;
     }
+    if (fhss_configuration->ws_bc_channel_function == WS_FIXED_CHANNEL || (fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval == 0 || fhss_structure->ws->fhss_configuration.fhss_broadcast_interval == 0)) {
+        fhss_structure->ws->synchronization_time = 0;
+    }
+
     if ((fhss_structure->ws->unicast_timer_running == false) && (fhss_configuration->ws_uc_channel_function != WS_FIXED_CHANNEL) && fhss_configuration->fhss_uc_dwell_interval) {
         fhss_ws_start_timer(fhss_structure, MS_TO_US(fhss_configuration->fhss_uc_dwell_interval), fhss_unicast_handler);
         fhss_structure->ws->unicast_timer_running = true;