Wi-sun State machine update

Fixed EAPOL missing EAPOL auhentication state set.

Updated EAPOL parent scan print.

Change-Id: Ibb8458fb4cd4761605e3826428c705d51e3155b5

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -927,14 +927,14 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
             uint16_t pan_cost = (pan_information.routing_cost / PRC_WEIGHT_FACTOR) + (pan_information.pan_size / PS_WEIGHT_FACTOR);
             uint16_t current_pan_cost = (cur->ws_info->parent_info.pan_information.routing_cost / PRC_WEIGHT_FACTOR) + (cur->ws_info->parent_info.pan_information.pan_size / PS_WEIGHT_FACTOR);
             if (current_pan_cost < pan_cost) {
-                tr_info("EAPOL target dropped Higher Pan cost");
+                tr_info("EAPOL target dropped Higher Pan cost %u > %u current", pan_cost, current_pan_cost);
                 return;
             }
 
             // If pan cost is the same then we select the one we hear highest
             if (current_pan_cost == pan_cost &&
                     cur->ws_info->parent_info.signal_dbm > data->signal_dbm) {
-                tr_info("EAPOL target dropped Lower link quality");
+                tr_info("EAPOL target dropped Lower link quality %u < %u current", data->signal_dbm, cur->ws_info->parent_info.signal_dbm);
                 return;
             }
 
@@ -2080,7 +2080,7 @@ void ws_bootstrap_event_configuration_start(protocol_interface_info_entry_t *cur
 }
 void ws_bootstrap_event_authentication_start(protocol_interface_info_entry_t *cur)
 {
-    ws_bootsrap_event_trig(WS_AUTHENTICATION_START, cur->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
+    ws_bootstrap_state_change(cur, ER_PANA_AUTH);
 }
 void ws_bootstrap_event_operation_start(protocol_interface_info_entry_t *cur)
 {
@@ -2336,21 +2336,6 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             // Start network scan
             ws_bootstrap_start_discovery(cur);
             break;
-        case WS_AUTHENTICATION_START:
-            tr_info("authentication start");
-            // only advert sol stopped as we might be doing re authentication
-            cur->ws_info->trickle_pas_running = false;
-            //Add Test ecurity key and security level's
-
-
-            // Advertisements stopped during the EAPOL
-            cur->ws_info->trickle_pa_running = false;
-            cur->ws_info->trickle_pc_running = false;
-            cur->ws_info->trickle_pas_running = false;
-            cur->ws_info->trickle_pcs_running = false;
-
-            ws_bootstrap_start_authentication(cur);
-            break;
 
         case WS_CONFIGURATION_START:
             tr_info("Configuration start");
@@ -2512,6 +2497,7 @@ static void ws_bootstrap_state_change(protocol_interface_info_entry_t *cur, icmp
     cur->bootsrap_state_machine_cnt = 1;
     cur->nwk_bootstrap_state = nwk_bootstrap_state;
 }
+
 void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
 {
 
@@ -2528,6 +2514,19 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
             tr_debug("WS SM:configuration Scan");
             ws_bootstrap_configure_process(cur);
             break;
+        case ER_PANA_AUTH:
+            tr_info("authentication start");
+            // only advert sol stopped as we might be doing re authentication
+            cur->ws_info->trickle_pas_running = false;
+            //Add Test ecurity key and security level's
+            // Advertisements stopped during the EAPOL
+            cur->ws_info->trickle_pa_running = false;
+            cur->ws_info->trickle_pc_running = false;
+            cur->ws_info->trickle_pas_running = false;
+            cur->ws_info->trickle_pcs_running = false;
+
+            ws_bootstrap_start_authentication(cur);
+            break;
         case ER_RPL_SCAN:
             tr_debug("WS SM:Wait RPL to contact DODAG root");
             ws_bootstrap_rpl_wait_process(cur);

source/6LoWPAN/ws/ws_bootstrap.h

@@ -23,7 +23,6 @@ typedef enum {
     WS_INIT_EVENT = 0,       /**< tasklet initializion event*/
     WS_DISCOVERY_START,      /**< discovery start*/
     WS_CONFIGURATION_START,  /**< configuration learn start*/
-    WS_AUTHENTICATION_START, /**< authentication start*/
     WS_OPERATION_START,      /**< active operation start*/
     WS_ROUTING_READY,        /**< RPL routing connected to BR*/
     WS_ADDRESS_ADDED         /**< Address added to IF*/