Merge pull request #2001 from ARMmbed/iotthd-2949

RPL DAO target request Update

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -468,8 +468,18 @@ uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur)
     if (test_pan_size_override != 0xffff) {
         return test_pan_size_override;
     }
+    //
+    const uint8_t *prefix_ptr;
+    if ((configuration & (BBR_ULA_C | BBR_GUA_C)) == BBR_GUA_C) {
+        //Use just GUA Prefix
+        prefix_ptr = global_dodag_id;
 
-    rpl_control_get_instance_dao_target_count(cur->rpl_domain, RPL_INSTANCE_ID, NULL, &result);
+    } else {
+        //Use ULA for indentifier
+        prefix_ptr = static_dodag_id;
+    }
+
+    rpl_control_get_instance_dao_target_count(cur->rpl_domain, RPL_INSTANCE_ID, NULL, prefix_ptr, &result);
     return result;
 }
 

source/6LoWPAN/ws/ws_bootstrap.c

@@ -845,6 +845,7 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
 
     // Save route cost for all neighbours
     llc_neighbour_req_t neighbor_info;
+    neighbor_info.neighbor = NULL;
     if (ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, false)) {
         neighbor_info.ws_neighbor->routing_cost = pan_information.routing_cost;
     }
@@ -921,12 +922,16 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
     ws_bootstrap_pan_advertisement_analyse_active(cur, &pan_information);
 
     // Learn latest network information
-    if (cur->bootsrap_mode != ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
-        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;
-        cur->ws_info->pan_information.use_parent_bs = pan_information.use_parent_bs;
-        cur->ws_info->pan_information.version = pan_information.version;
+    if (cur->bootsrap_mode != ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER && neighbor_info.neighbor) {
+
+        if (neighbor_info.neighbor->link_role == PRIORITY_PARENT_NEIGHBOUR) {
+            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;
+            cur->ws_info->pan_information.use_parent_bs = pan_information.use_parent_bs;
+            cur->ws_info->pan_information.version = pan_information.version;
+        }
+
     }
 }
 

source/RPL/rpl_control.c

@@ -1654,13 +1654,14 @@ rpl_instance_t *rpl_control_lookup_instance(rpl_domain_t *domain, uint8_t instan
     return rpl_lookup_instance(domain, instance_id, dodagid);
 }
 
-bool rpl_control_get_instance_dao_target_count(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid, uint16_t *target_count)
+bool rpl_control_get_instance_dao_target_count(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid, const uint8_t *prefix, uint16_t *target_count)
 {
     rpl_instance_t *instance = rpl_lookup_instance(domain, instance_id, dodagid);
     if (!instance) {
         return false;
     }
-    *target_count = rpl_upward_read_dao_target_list_size(instance);
+
+    *target_count = rpl_upward_read_dao_target_list_size(instance, prefix);
     return true;
 }
 

source/RPL/rpl_control.h

@@ -160,7 +160,7 @@ void rpl_control_print(route_print_fn_t *print_fn);
 
 struct rpl_instance *rpl_control_enumerate_instances(rpl_domain_t *domain, struct rpl_instance *instance);
 struct rpl_instance *rpl_control_lookup_instance(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid);
-bool rpl_control_get_instance_dao_target_count(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid, uint16_t *target_count);
+bool rpl_control_get_instance_dao_target_count(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid, const uint8_t *prefix, uint16_t *target_count);
 bool rpl_control_read_dodag_info(const struct rpl_instance *instance, struct rpl_dodag_info_t *dodag_info);
 const rpl_dodag_conf_t *rpl_control_get_dodag_config(const struct rpl_instance *instance);
 const uint8_t *rpl_control_preferred_parent_addr(const struct rpl_instance *instance, bool global);

source/RPL/rpl_upward.c

@@ -1742,8 +1742,19 @@ void rpl_upward_print_instance(rpl_instance_t *instance, route_print_fn_t *print
     }
 }
 
-uint16_t rpl_upward_read_dao_target_list_size(const rpl_instance_t *instance)
+uint16_t rpl_upward_read_dao_target_list_size(const rpl_instance_t *instance, const uint8_t *target_prefix)
 {
+
+    if (target_prefix) {
+        uint16_t registered_address_count = 0;
+        ns_list_foreach(rpl_dao_target_t, target, &instance->dao_targets) {
+            if (bitsequal(target->prefix, target_prefix, 64)) {
+                registered_address_count++;
+            }
+        }
+        return registered_address_count;
+    }
+
     return ns_list_count(&instance->dao_targets);
 }
 

source/RPL/rpl_upward.h

@@ -143,5 +143,5 @@ void rpl_instance_run_parent_selection(rpl_instance_t *instance);
 void rpl_upward_print_instance(rpl_instance_t *instance, route_print_fn_t *print_fn);
 
 bool rpl_upward_read_dodag_info(const rpl_instance_t *instance, struct rpl_dodag_info_t *dodag_info);
-uint16_t rpl_upward_read_dao_target_list_size(const rpl_instance_t *instance);
+uint16_t rpl_upward_read_dao_target_list_size(const rpl_instance_t *instance, const uint8_t *target_prefix);
 #endif /* RPL_UPWARD_H_ */

source/libNET/src/net_load_balance.c

@@ -268,7 +268,7 @@ void net_load_balance_internal_state_activate(protocol_interface_info_entry_t *i
 static int8_t net_load_balance_api_get_node_count_cb(void *lb_user, uint16_t *node_count)
 {
     protocol_interface_info_entry_t *interface_ptr = lb_user;
-    if (rpl_control_get_instance_dao_target_count(interface_ptr->rpl_domain, 1, NULL, node_count)) {
+    if (rpl_control_get_instance_dao_target_count(interface_ptr->rpl_domain, 1, NULL, NULL, node_count)) {
         return 0;
     }
 

test/nanostack/unittest/stub/rpl_upward_stub.c

@@ -456,7 +456,7 @@ bool rpl_upward_read_dodag_info(const rpl_instance_t *instance, rpl_dodag_info_t
     return false;
 }
 
-uint16_t rpl_upward_read_dao_target_list_size(const rpl_instance_t *instance)
+uint16_t rpl_upward_read_dao_target_list_size(const rpl_instance_t *instance, const uint8_t *target_prefix)
 {
     return 0;
 }