NS Probe limiter accept only 2 probe at 16 seconds period.

Change-Id: If5e9cc443fa8a43ff4b8b00dadc0a2d97d887e1f

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1663,11 +1663,16 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
             activate_nud = true;
         } else {
 
+            if (cur->ws_info->ns_probed_timer > 7) {
+                return false;//Accept 1 probe start / every seconds call
+            }
+
             ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
             if (!rpl_control_probe_parent_candidate(cur, ll_address)) {
                 return false;
             }
 
+
             uint32_t probe_period = WS_PROBE_INIT_BASE_SECONDS << etx_entry->etx_samples;
             uint32_t time_block = 1 << etx_entry->etx_samples;
             if (time_from_start >= probe_period) {
@@ -1697,7 +1702,14 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
         ws_neighbor->accelerated_etx_probe = false;
         entry->timer = 1;
     }
+
     entry->nud_process = nud_proces;
+    if (!nud_proces) {
+        cur->ws_info->ns_probed_timer += 8;
+        if (cur->ws_info->ns_probed_timer > 32) {
+            cur->ws_info->ns_probed_timer = 32;
+        }
+    }
 
     return true;
 }
@@ -2141,6 +2153,11 @@ static bool ws_rpl_new_parent_callback(uint8_t *ll_parent_address, void *handle,
         return false;
     }
 
+    if (cur->ws_info->ns_probed_timer > 8) {
+        //2 probe have been done so Try to avoid put more before accept new one's
+        return false;
+    }
+
     if (blacklist_reject(ll_parent_address)) {
         // Rejected by blacklist
         return false;
@@ -2158,6 +2175,7 @@ static bool ws_rpl_new_parent_callback(uint8_t *ll_parent_address, void *handle,
 
     ws_bootstrap_neighbor_info_request(cur, mac64, &neigh_buffer, false);
 
+
     if (rpl_control_candidate_list_size(cur, instance) < cur->ws_info->rpl_parent_candidate_max) {
         //Not reach max value yet accept then all go to create neigh table
         goto neigh_create;
@@ -2637,6 +2655,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->ns_probed_timer = 0;
 
             if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
                 tr_info("Border router start network");
@@ -2953,6 +2972,15 @@ void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t s
             ws_bootstrap_event_discovery_start(cur);
         }
     }
+
+    //Probe limiter timer
+    if (cur->ws_info->ns_probed_timer) {
+        if (cur->ws_info->ns_probed_timer > seconds) {
+            cur->ws_info->ns_probed_timer -= seconds;
+        } else {
+            cur->ws_info->ns_probed_timer = 0;
+        }
+    }
 }
 
 void ws_primary_parent_update(protocol_interface_info_entry_t *interface, mac_neighbor_table_entry_t *neighbor)

source/6LoWPAN/ws/ws_common.h

@@ -91,6 +91,9 @@ typedef struct ws_info_s {
     // default fhss parameters for this device
     uint8_t fhss_uc_dwell_interval;
     uint8_t fhss_bc_dwell_interval;
+    //NS Probe lmiter
+    uint32_t ns_probed_timer;
+
     uint32_t fhss_bc_interval;
     uint8_t fhss_uc_channel_function;
     uint8_t fhss_bc_channel_function;

source/RPL/rpl_policy.c

@@ -238,7 +238,7 @@ uint16_t rpl_policy_dio_parent_selection_delay(rpl_domain_t *domain)
 {
     (void)domain;
 
-    return 15; /* seconds */
+    return 19; /* seconds */
 }
 
 uint16_t rpl_policy_repair_initial_dis_delay(rpl_domain_t *domain)

source/Service_Libs/etx/etx.c

@@ -202,6 +202,7 @@ void etx_transm_attempts_update(int8_t interface_id, uint8_t attempts, bool succ
     if (!entry) {
         return;
     }
+
     if (entry->etx_samples < 7) {
         entry->etx_samples++;
     }
@@ -216,6 +217,10 @@ void etx_transm_attempts_update(int8_t interface_id, uint8_t attempts, bool succ
         }
 
         etx_calculation(entry, storage->attempts_count, storage->received_acks, attribute_index);
+
+        if (entry->etx_samples < 7 && !success) {
+            entry->etx_samples = 7; //Stop Probing to failure
+        }
         return;
     }