Fixed trickle configuration for Discovery

Only one configuration needed. Removed the extra
Used correct calculation for the IMAX

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -63,16 +63,9 @@
 
 #ifdef HAVE_WS
 
-static const trickle_params_t trickle_params_pan_advertisement = {
+static const trickle_params_t trickle_params_pan_discovery = {
     .Imin = 60,         /* 60 second; ticks are 1s */
-    .Imax = 2^4 *60,    /* 960 seconds 16 min*/
-    .k = 1,             /* 1 */
-    .TimerExpirations = TRICKLE_EXPIRATIONS_INFINITE
-};
-
-static const trickle_params_t trickle_params_pan_configuration = {
-    .Imin = 60,         /* 60 second; ticks are 1s */
-    .Imax = 2^4 *60,    /* 960 seconds 16 min*/
+    .Imax = 60 << 4,      /* 960 seconds 16 min*/
     .k = 1,             /* 1 */
     .TimerExpirations = TRICKLE_EXPIRATIONS_INFINITE
 };
@@ -343,7 +336,7 @@ static void ws_bootstrap_pan_advertisement_analyse_active(struct protocol_interf
     if (pan_information->routing_cost <= cur->ws_info->pan_information.routing_cost) {
         trickle_consistent_heard(&cur->ws_info->trickle_pan_advertisement);
     } else {
-        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_advertisement);
+        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery);
     }
 
 }
@@ -426,7 +419,7 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
 
             if(ws_neighbor_class_rssi_from_dbm_calculate(data->signal_dbm) < (CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS)) {
                 // First neighbor is too low we need to wait one extra trickle
-                cur->bootsrap_state_machine_cnt += trickle_params_pan_configuration.Imin*10 + randLIB_get_8bit() % 50;
+                cur->bootsrap_state_machine_cnt += trickle_params_pan_discovery.Imin*10 + randLIB_get_8bit() % 50;
             }
         }
 
@@ -472,7 +465,7 @@ static void ws_bootstrap_pan_advertisement_solicit_analyse(struct protocol_inter
      * An inconsistent transmission is defined as:
      * A PAN Advertisement Solicit with NETNAME-IE matching that of the receiving node.
      */
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_advertisement);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery);
     /*
      *  A consistent transmission is defined as
      *  a PAN Advertisement Solicit with NETNAME-IE / Network Name matching that configured on the receiving node.
@@ -547,7 +540,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
         common_serial_number_greater_16(cur->ws_info->pan_information.pan_version, pan_version)) {
         // received version is lower se we need to reset the trickle
         tr_info("older pan version heard");
-        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_configuration);
+        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
         return;
     }
     trickle_consistent_heard(&cur->ws_info->trickle_pan_config);
@@ -633,7 +626,7 @@ static void ws_bootstrap_pan_config_solicit_analyse(struct protocol_interface_in
      *  A PAN Configuration Solicit with a PAN-ID matching that of the receiving node and
      *  a NETNAME-IE / Network Name matching the network name configured on the receiving
      */
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_advertisement);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
 }
 static bool ws_bootstrap_network_found(protocol_interface_info_entry_t *cur)
 {
@@ -1047,10 +1040,10 @@ static void ws_bootstrap_network_discovery_configure(protocol_interface_info_ent
 
 static void ws_bootstrap_advertise_start(protocol_interface_info_entry_t *cur)
 {
-    trickle_start(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_advertisement);
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_advertisement);
-    trickle_start(&cur->ws_info->trickle_pan_config, &trickle_params_pan_configuration);
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config, &trickle_params_pan_configuration);
+    trickle_start(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_discovery);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_discovery);
+    trickle_start(&cur->ws_info->trickle_pan_config, &trickle_params_pan_discovery);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config, &trickle_params_pan_discovery);
 }
 
 // Start network scan
@@ -1076,11 +1069,11 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
     ws_bootstrap_ip_stack_addr_clear(cur);
 
     // Reset advertisement solicit trickle to start discovering network
-    trickle_start(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_configuration);
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_configuration);
+    trickle_start(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_discovery);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_discovery);
 
     // Discovery statemachine is checkked after two trickle interval
-    cur->bootsrap_state_machine_cnt = 2*trickle_params_pan_configuration.Imin*10 + randLIB_get_8bit() % 50;
+    cur->bootsrap_state_machine_cnt = 2*trickle_params_pan_discovery.Imin*10 + randLIB_get_8bit() % 50;
 }
 // Start configuration learning
 static void ws_bootstrap_start_configuration_learn(protocol_interface_info_entry_t *cur)
@@ -1096,8 +1089,8 @@ static void ws_bootstrap_start_configuration_learn(protocol_interface_info_entry
     ws_bootstrap_ip_stack_reset(cur);
 
     // Reset advertisement solicit trickle to start discovering network
-    trickle_start(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_configuration);
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_configuration);
+    trickle_start(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_discovery);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_discovery);
 }
 
 /*
@@ -1126,7 +1119,7 @@ void ws_bootstrap_event_routing_ready(protocol_interface_info_entry_t *cur)
 }
 void ws_bootstrap_configuration_trickle_reset(protocol_interface_info_entry_t *cur)
 {
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_configuration);
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
 }
 
 
@@ -1341,7 +1334,7 @@ void ws_bootstrap_network_scan_process(protocol_interface_info_entry_t *cur)
 
     if (!ws_bootstrap_network_found(cur)) {
         // Next check will be after one trickle
-        cur->bootsrap_state_machine_cnt += trickle_params_pan_configuration.Imin*10 + randLIB_get_8bit() % 50;
+        cur->bootsrap_state_machine_cnt += trickle_params_pan_discovery.Imin*10 + randLIB_get_8bit() % 50;
         return;
     }
     tr_info("select network");
@@ -1449,22 +1442,22 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
 }
 void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds)
 {
-    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_advertisement, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_discovery, seconds)) {
         // send PAN advertisement solicit
         tr_info("Send PAN advertisement Solicit");
         ws_bootstrap_pan_advert_solicit(cur);
     }
-    if(trickle_timer(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_configuration, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_discovery, seconds)) {
         // send PAN Configuration solicit
         tr_info("Send PAN configuration Solicit");
         ws_bootstrap_pan_config_solicit(cur);
     }
-    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_advertisement, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_discovery, seconds)) {
         // send PAN advertisement
         tr_info("Send PAN advertisement");
         ws_bootstrap_pan_advert(cur);
     }
-    if(trickle_timer(&cur->ws_info->trickle_pan_config, &trickle_params_pan_configuration, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_config, &trickle_params_pan_discovery, seconds)) {
         // send PAN Configuration
         tr_info("Send PAN configuration");
         ws_bootstrap_pan_config(cur);