Reduce wi-sun NS Probe

Do NS Probe only to RPL parent candidate

Ondemand NS probe for RX NS(ARO)

Change-Id: I2a36d85b666c094cce8b648063fb1ff95bdb92dc

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -664,7 +664,7 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
         if (!ws_neighbour || !etx_entry || etx_entry->etx_samples < 1 /*||
                 !ws_neighbour->candidate_parent*/) {
             // if RSL value is not good enough candidate parent flag is removed and device not accepted as parent
-            tr_debug("ws_etx_read not valid params");
+            //tr_debug("ws_etx_read not valid params");
             return 0xffff;
         }
 
@@ -998,7 +998,7 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
         uint8_t ll_address[16];
         ws_bootsrap_create_ll_address(ll_address, neighbor_info.neighbor->mac64);
 
-        if (rpl_control_is_dodag_parent(cur, ll_address, true)) {
+        if (rpl_control_is_dodag_parent(cur, ll_address)) {
             cur->ws_info->pan_information.pan_size = pan_information.pan_size;
             cur->ws_info->pan_information.routing_cost = pan_information.routing_cost;
             cur->ws_info->pan_information.rpl_routing_method = pan_information.rpl_routing_method;
@@ -1363,7 +1363,7 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
             memcpy(ll_target + 8, cur->mac64, 8);
             ll_target[8] ^= 2;
 
-            if (rpl_control_is_dodag_parent(interface, ll_target, true)) {
+            if (rpl_control_is_dodag_parent(interface, ll_target)) {
                 // Possible parent is limited to 3 by default?
                 continue;
             }
@@ -1519,17 +1519,12 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
             activate_nud = true;
         } else {
             if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
-                if (etx_entry->etx_samples || !ws_neighbor->unicast_data_rx) {
-                    //Border router just need 1 sample for ETX
-                    return false;
-                }
+                return false; // Border router never probe automatically
             } else {
                 uint8_t ll_address[16];
                 ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
-                if (!rpl_control_is_dodag_parent(cur, ll_address, false)) {
-                    if (etx_entry->etx_samples || !ws_neighbor->unicast_data_rx) {
-                        return 0;
-                    }
+                if (!rpl_control_is_dodag_parent_candidate(cur, ll_address, WS_NEIGHBOUR_MAX_CANDIDATE_PROBE)) {
+                    return false;
                 }
             }
 

source/6LoWPAN/ws/ws_common_defines.h

@@ -191,6 +191,7 @@ typedef struct ws_bs_ie {
 #define WS_NEIGHBOR_NUD_TIMEOUT WS_NEIGHBOR_LINK_TIMEOUT / 2
 
 #define WS_NEIGBOR_ETX_SAMPLE_MAX 3
+#define WS_NEIGHBOUR_MAX_CANDIDATE_PROBE 5
 
 #define WS_PROBE_INIT_BASE_SECONDS 8
 

source/RPL/rpl_control.c

@@ -204,20 +204,35 @@ void rpl_control_address_register_done(protocol_interface_info_entry_t *interfac
     }
 }
 
-bool rpl_control_is_dodag_parent(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16], bool selected)
+bool rpl_control_is_dodag_parent(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16])
 {
     if (!interface->rpl_domain) {
         return false;
     }
     // go through instances and parents and check if they match the address.
     ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
-        if (rpl_instance_address_is_parent(instance, ll_addr, selected)) {
+        if (rpl_instance_address_is_parent(instance, ll_addr)) {
             return true;
         }
     }
     return false;
 }
 
+bool rpl_control_is_dodag_parent_candidate(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16], uint16_t candidate_cmp_limiter)
+{
+    if (!interface->rpl_domain) {
+        return false;
+    }
+    // go through instances and parents and check if they match the address.
+    ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
+        if (rpl_instance_address_is_candidate(instance, ll_addr, candidate_cmp_limiter)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
 uint16_t rpl_control_parent_candidate_list_size(protocol_interface_info_entry_t *interface, bool parent_list)
 {
     if (!interface->rpl_domain) {

source/RPL/rpl_control.h

@@ -147,7 +147,8 @@ void rpl_control_set_callback(rpl_domain_t *domain, rpl_domain_callback_t callba
 /* Target publishing */
 void rpl_control_publish_host_address(rpl_domain_t *domain, const uint8_t addr[16], uint32_t lifetime);
 void rpl_control_unpublish_address(rpl_domain_t *domain, const uint8_t addr[16]);
-bool rpl_control_is_dodag_parent(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16], bool selected);
+bool rpl_control_is_dodag_parent(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
+bool rpl_control_is_dodag_parent_candidate(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16], uint16_t candidate_cmp_limiter);
 uint16_t rpl_control_parent_candidate_list_size(struct protocol_interface_info_entry  *interface, bool parent_list);
 void rpl_control_neighbor_delete(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
 /* Parent link confirmation API extension */

source/RPL/rpl_upward.c

@@ -1617,23 +1617,41 @@ uint16_t rpl_instance_current_rank(const rpl_instance_t *instance)
     return instance->current_rank;
 }
 
-bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr, bool selected)
+bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr)
 {
     ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
-        if (selected && !neighbour->dodag_parent) {
+        if (!neighbour->dodag_parent) {
             // list is ordered so first encounter of false means no more parents in list
             return false;
         }
 
         if (addr_ipv6_equal(neighbour->ll_address, ipv6_addr)) {
-            if (!selected) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool rpl_instance_address_is_candidate(rpl_instance_t *instance, const uint8_t *ipv6_addr, uint16_t candidate_amount)
+{
+    uint16_t list_compared = 0;
+
+    ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
+        if (addr_ipv6_equal(neighbour->ll_address, ipv6_addr)) {
+
+            if (!instance->current_dodag_version) {
                 return true;
             }
-            if (!neighbour->dodag_parent) {
-                return false;
+
+            if (rpl_rank_compare(instance->current_dodag_version->dodag, neighbour->rank, instance->current_rank) & RPL_CMP_LESS) {
+                return true;
             }
 
-            return true;
+            return false;
+        }
+        list_compared++;
+        if (candidate_amount && list_compared >= candidate_amount) {
+            return false;
         }
 
     }

source/RPL/rpl_upward.h

@@ -83,7 +83,8 @@ void rpl_instance_dio_trigger(rpl_instance_t *instance, struct protocol_interfac
 void rpl_instance_set_local_repair(rpl_instance_t *instance, bool repair);
 bool rpl_instance_local_repair(const rpl_instance_t *instance);
 uint16_t rpl_instance_current_rank(const rpl_instance_t *instance);
-bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr, bool selected);
+bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr);
+bool rpl_instance_address_is_candidate(rpl_instance_t *instance, const uint8_t *ipv6_addr, uint16_t candidate_amount);
 uint16_t rpl_instance_address_candidate_count(rpl_instance_t *instance, bool selected_parents);
 void rpl_instance_neighbor_delete(rpl_instance_t *instance, const uint8_t *ipv6_addr);
 void rpl_instance_slow_timer(rpl_instance_t *instance, uint16_t seconds);

test/nanostack/unittest/stub/rpl_upward_stub.c

@@ -418,10 +418,16 @@ uint16_t rpl_instance_current_rank(const rpl_instance_t *instance)
     return 0;
 }
 
-bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr, bool selected)
+bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr)
 {
     return false;
 }
+
+bool rpl_instance_address_is_candidate(rpl_instance_t *instance, const uint8_t *ipv6_addr, uint16_t candidate_amount)
+{
+    return false;
+}
+
 void rpl_instance_neighbor_delete(rpl_instance_t *instance, const uint8_t *ipv6_addr)
 {
 }