DIO init send block for node

Node must have a selected parent and no pending dao process.

Author: Juha Heiskanen

source/RPL/rpl_downward.c

@@ -178,7 +178,7 @@ static void rpl_downward_target_refresh(rpl_dao_target_t *target)
     target->info.non_root.path_lifetime = 0;
 }
 
-static bool rpl_instance_parent_selection_ready(rpl_instance_t *instance)
+bool rpl_instance_parent_selection_ready(rpl_instance_t *instance)
 {
     rpl_neighbour_t *neighbour = ns_list_get_first(&instance->candidate_neighbours);
     if (neighbour && neighbour->dodag_parent &&  neighbour->dao_path_control) {
@@ -407,7 +407,7 @@ void rpl_instance_dao_trigger(rpl_instance_t *instance, uint16_t delay)
     }
     if (instance->delay_dao_timer == 0 || instance->delay_dao_timer > delay) {
         instance->delay_dao_timer = delay;
-        //tr_debug("DAO trigger %" PRIu16, delay);
+        tr_debug("DAO trigger %" PRIu16, delay);
     }
 }
 
@@ -723,7 +723,11 @@ void rpl_instance_send_dao_update(rpl_instance_t *instance)
         instance->dao_in_transit = false;
         instance->dao_attempt = 0;
         instance->dao_retry_timer = 0;
-        instance->delay_dao_timer = 0;
+        // Primary parent deletion will trigger parent selection
+        // While waiting, leave dao_timer "running" to indicate DAO incomplete
+        // This is checked in rpl_upward_dio_timer to delay initial DIO sending
+        // If we stopped the timer, that code might think DAO registration was complete
+        instance->delay_dao_timer = 0xffff;
         return;
     }
 
@@ -1863,9 +1867,6 @@ static void rpl_instance_address_registration_cancel(rpl_instance_t *instance)
 
     instance->wait_response = NULL;
     instance->pending_neighbour_confirmation = false;
-    instance->delay_dao_timer = 0;
-    instance->dao_in_transit = false;
-    instance->dao_retry_timer = 0;
 }
 
 static void rpl_instance_address_registration_retry(rpl_dao_target_t *dao_target)
@@ -1881,8 +1882,15 @@ void rpl_instance_parent_address_reg_timer_update(rpl_instance_t *instance, uint
         return; //No need validate any confirmation
     }
 
+    if (rpl_instance_am_root(instance)) {
+        tr_debug("Root shuold not handle this");
+        rpl_instance_address_registration_cancel(instance);
+        return;
+    }
+
     //Verify that we have selected parent and it have a dao path control
     if (!rpl_instance_parent_selection_ready(instance)) {
+        tr_debug("Parent select not ready");
         rpl_instance_address_registration_cancel(instance);
         return;
     }
@@ -1925,6 +1933,7 @@ void rpl_instance_parent_address_reg_timer_update(rpl_instance_t *instance, uint
 
     if_address_entry_t *address = rpl_interface_addr_get(interface, dao_target->prefix);
     if (!address) {
+        tr_debug("No address for req");
         rpl_instance_address_registration_cancel(instance);
         return;
     }

source/RPL/rpl_downward.h

@@ -46,6 +46,7 @@ void rpl_instance_parent_address_reg_timer_update(struct rpl_instance *instance,
 void rpl_instance_send_address_registration(rpl_instance_t *instance, const uint8_t addr[16]);
 bool rpl_instance_address_registration_done(protocol_interface_info_entry_t *interface, rpl_instance_t *instance, rpl_neighbour_t *neighbour, uint8_t status);
 struct rpl_dao_target *rpl_instance_get_active_target_confirmation(struct rpl_instance *instance);
+bool rpl_instance_parent_selection_ready(struct rpl_instance *instance);
 
 #ifdef HAVE_RPL_DAO_HANDLING
 bool rpl_instance_dao_received(struct rpl_instance *instance, const uint8_t src[16], int8_t interface_id, bool multicast, const uint8_t *opts, uint16_t opts_len, uint8_t *status_out);

source/RPL/rpl_upward.c

@@ -1836,11 +1836,12 @@ void rpl_upward_dio_timer(rpl_instance_t *instance, uint16_t ticks)
     if (rpl_dodag_am_leaf(dodag) && !instance->poison_count) {
         return;
     }
+
     /* Delay sending first DIO if we are still potentially gathering info */
     /* Important to always send DIOs if we ever have sent any, so we can indicate problems to others */
-    if (!instance->last_advertised_dodag_version && rpl_policy_parent_confirmation_requested()) {
-        // We dont have any valid address in interface
-        if (ns_list_count(&instance->dao_targets) == 0) {
+    if (!rpl_instance_am_root(instance) && !instance->last_advertised_dodag_version && rpl_policy_parent_confirmation_requested()) {
+        // We dont have any valid parent selected
+        if (!rpl_instance_parent_selection_ready(instance)) {
             return;
         }
         /* Address registrations for parent ongoing*/
@@ -1852,6 +1853,7 @@ void rpl_upward_dio_timer(rpl_instance_t *instance, uint16_t ticks)
             return;
         }
     }
+
     if (trickle_timer(&instance->dio_timer, &dodag->dio_timer_params, ticks)) {
         instance->dio_not_consistent = false;
         rpl_instance_dio_trigger(instance, NULL, NULL);