Wi-sun config message consustent filter

Wi-sun config asych message may RX multile time with fhss system. When new pan version
heared we reset trickle. RX same message at following channels suppress new version advertisment.
This PR add 10 seconds filter period for fix a problem.

Change-Id: Ic1f3131496698ebc0e1f2d551e6dfa494b3e1337

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -823,6 +823,7 @@ void ws_bootstrap_configuration_reset(protocol_interface_info_entry_t *cur)
     cur->ws_info->trickle_pa_running = false;
     cur->ws_info->trickle_pcs_running = false;
     cur->ws_info->trickle_pc_running = false;
+    cur->ws_info->trickle_pc_consistency_block_period = 0;
 
     //cur->mac_security_key_usage_update_cb = ws_management_mac_security_key_update_cb;
     return;
@@ -1248,8 +1249,12 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     if (cur->ws_info->configuration_learned) {
         tr_info("PAN Config analyse own:%d, heard:%d", cur->ws_info->pan_information.pan_version, pan_version);
         if (cur->ws_info->pan_information.pan_version == pan_version) {
-            // Same version heard so it is consistent
-            trickle_consistent_heard(&cur->ws_info->trickle_pan_config);
+            //Check if Trgigle have been resetted in short time skip this then
+            if (cur->ws_info->trickle_pc_consistency_block_period == 0) {
+                // Same version heard so it is consistent
+                trickle_consistent_heard(&cur->ws_info->trickle_pan_config);
+            }
+
             if (neighbour_pointer_valid && neighbor_info.neighbor->link_role == PRIORITY_PARENT_NEIGHBOUR) {
                 ws_bootstrap_primary_parent_set(cur, &neighbor_info, WS_PARENT_SOFT_SYNCH);
             }
@@ -1265,6 +1270,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
                 // older version heard ignoring the message
                 return;
             }
+            cur->ws_info->trickle_pc_consistency_block_period = WS_CONFIG_CONSISTENT_FILTER_PERIOD;
         }
     }
 
@@ -2315,6 +2321,7 @@ static void ws_bootstrap_advertise_start(protocol_interface_info_entry_t *cur)
     cur->ws_info->trickle_pa_running = true;
     trickle_start(&cur->ws_info->trickle_pan_advertisement, &cur->ws_info->trickle_params_pan_discovery);
     cur->ws_info->trickle_pc_running = true;
+    cur->ws_info->trickle_pc_consistency_block_period = 0;
     trickle_start(&cur->ws_info->trickle_pan_config, &cur->ws_info->trickle_params_pan_discovery);
 }
 
@@ -2712,6 +2719,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
+            cur->ws_info->trickle_pc_consistency_block_period = 0;
 
             if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
                 tr_info("Border router start network");
@@ -2779,6 +2787,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
+            cur->ws_info->trickle_pc_consistency_block_period = 0;
 
             // Build list of possible neighbours and learn first broadcast schedule
 
@@ -2791,6 +2800,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
+            cur->ws_info->trickle_pc_consistency_block_period = 0;
             // Activate RPL
             // Activate IPv6 stack
             ws_bootstrap_ip_stack_activate(cur);
@@ -2810,6 +2820,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
+            cur->ws_info->trickle_pc_consistency_block_period = 0;
 
             // Indicate PAE controller that bootstrap is ready
             ws_pae_controller_bootstrap_done(cur);
@@ -2969,6 +2980,7 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
+            cur->ws_info->trickle_pc_consistency_block_period = 0;
             ws_fhss_configure(cur, false);
             ws_bootstrap_start_authentication(cur);
             break;
@@ -3029,11 +3041,21 @@ void ws_bootstrap_trickle_timer(protocol_interface_info_entry_t *cur, uint16_t t
         tr_info("Send PAN advertisement");
         ws_bootstrap_pan_advert(cur);
     }
-    if (cur->ws_info->trickle_pc_running &&
-            trickle_timer(&cur->ws_info->trickle_pan_config, &cur->ws_info->trickle_params_pan_discovery, ticks)) {
-        // send PAN Configuration
-        tr_info("Send PAN configuration");
-        ws_bootstrap_pan_config(cur);
+    if (cur->ws_info->trickle_pc_running) {
+
+        if (cur->ws_info->trickle_pc_consistency_block_period) {
+            if (ticks >= cur->ws_info->trickle_pc_consistency_block_period) {
+                cur->ws_info->trickle_pc_consistency_block_period = 0;
+            } else {
+                cur->ws_info->trickle_pc_consistency_block_period -= ticks;
+            }
+        }
+
+        if (trickle_timer(&cur->ws_info->trickle_pan_config, &cur->ws_info->trickle_params_pan_discovery, ticks)) {
+            // send PAN Configuration
+            tr_info("Send PAN configuration");
+            ws_bootstrap_pan_config(cur);
+        }
     }
 }
 

source/6LoWPAN/ws/ws_common.h

@@ -97,6 +97,7 @@ typedef struct ws_info_s {
     bool trickle_pa_running: 1;
     bool trickle_pcs_running: 1;
     bool trickle_pc_running: 1;
+    uint16_t trickle_pc_consistency_block_period;
     ws_pending_key_index_t pending_key_index_info;
     // default fhss parameters for this device
     uint8_t fhss_uc_dwell_interval;

source/6LoWPAN/ws/ws_common_defines.h

@@ -249,6 +249,11 @@ typedef struct ws_bs_ie {
  */
 #define WS_TACK_MAX_MS 5
 
+/*
+ * Config new version consistent filter period in 100ms periods
+ */
+#define WS_CONFIG_CONSISTENT_FILTER_PERIOD 100
+
 // With FHSS we need to check CCA twice on TX channel
 #define WS_NUMBER_OF_CSMA_PERIODS  2
 // Interval between two CCA checks