Modify discovery start timing

Discovery trickle reseted only when comming from state 2 or 3
wait results for advertisements own trickle interval + imin

removed unneeded boolean

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -699,8 +699,6 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
         return -3;
     }
 
-    //Enable Power bootup timer setup
-    cur->ws_info->power_up_setup = true;
     // Save FHSS api
     cur->ws_info->fhss_api = ns_sw_mac_get_fhss_api(cur->mac_api);
 
@@ -1967,25 +1965,31 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
     // New network scan started old addresses not assumed valid anymore
     ws_bootstrap_ip_stack_addr_clear(cur);
 
-    // Reset advertisement solicit trickle to start discovering network
-    cur->ws_info->trickle_pas_running = true;
-    trickle_start(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
-    if (cur->ws_info->power_up_setup) {
-        cur->ws_info->power_up_setup = false;
-        tr_debug("PAS init I %u and t %u", cur->ws_info->trickle_pan_advertisement_solicit.I, cur->ws_info->trickle_pan_advertisement_solicit.t);
-    } else {
-        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
-    }
-
     if ((cur->lowpan_info & INTERFACE_NWK_BOOTSRAP_ACTIVE) != INTERFACE_NWK_BOOTSRAP_ACTIVE) {
         // we have sent bootstrap ready event and now
         // restarted discovery so bootstrap down event is sent
         cur->lowpan_info |= INTERFACE_NWK_BOOTSRAP_ACTIVE;
         ws_nwk_event_post(cur, ARM_NWK_NWK_CONNECTION_DOWN);
     }
 
-    // Discovery statemachine is checkked after two trickle interval
-    cur->bootsrap_state_machine_cnt = 2 * cur->ws_info->trickle_params_pan_discovery.Imin + randLIB_get_8bit() % 50;
+    // Start advertisement solicit trickle and calculate when we are checking the status
+    cur->ws_info->trickle_pas_running = true;
+    if (cur->ws_info->trickle_pan_advertisement_solicit.I != cur->ws_info->trickle_params_pan_discovery.Imin) {
+        // Trickle not reseted so starting a new interval
+        trickle_start(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
+    }
+
+    // Discovery statemachine is checkked after we have sent the Solicit
+    uint16_t time_to_solicit = 0;
+    if (cur->ws_info->trickle_pan_advertisement_solicit.t > cur->ws_info->trickle_pan_advertisement_solicit.now) {
+        time_to_solicit = cur->ws_info->trickle_pan_advertisement_solicit.t - cur->ws_info->trickle_pan_advertisement_solicit.now;
+    }
+
+    tr_debug("Disc params imin %u, imax %u, expirations %u, k %u PAS Trickle I %u t %u, now %u, c %u",
+             cur->ws_info->trickle_params_pan_discovery.Imin, cur->ws_info->trickle_params_pan_discovery.Imax, cur->ws_info->trickle_params_pan_discovery.TimerExpirations, cur->ws_info->trickle_params_pan_discovery.k,
+             cur->ws_info->trickle_pan_advertisement_solicit.I, cur->ws_info->trickle_pan_advertisement_solicit.t, cur->ws_info->trickle_pan_advertisement_solicit.now, cur->ws_info->trickle_pan_advertisement_solicit.c);
+
+    cur->bootsrap_state_machine_cnt = time_to_solicit + cur->ws_info->trickle_params_pan_discovery.Imin + randLIB_get_8bit() % 50;
 }
 
 // Start authentication
@@ -2039,6 +2043,8 @@ static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_
     } else {
         tr_debug("authentication failed");
         // What else to do to start over again...
+        // Trickle is reseted when entering to discovery from state 2
+        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
         ws_bootstrap_event_discovery_start(cur);
     }
 }
@@ -2522,9 +2528,6 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *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;
@@ -2564,6 +2567,8 @@ void ws_bootstrap_trickle_timer(protocol_interface_info_entry_t *cur, uint16_t t
             // Remove network keys from MAC
             ws_pae_controller_nw_keys_remove(cur);
 
+            // Trickle is reseted when entering to discovery from state 3
+            trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
             ws_bootstrap_event_discovery_start(cur);
             return;
         }

source/6LoWPAN/ws/ws_common.h

@@ -79,7 +79,6 @@ typedef struct ws_info_s {
     bool trickle_pa_running: 1;
     bool trickle_pcs_running: 1;
     bool trickle_pc_running: 1;
-    bool power_up_setup: 1;
     // default fhss parameters for this device
     uint8_t fhss_uc_dwell_interval;
     uint8_t fhss_bc_dwell_interval;