RPL parent update handle update

Do not trig DAO or Address reg when RPL candidate is gone.

Address registration is only done when selected a new parent.

Change-Id: I84f799c0ab35b0498007651785a73e81a65705f7

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2066,7 +2066,7 @@ static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
          *
          */
 
-    } else if (event == RPL_EVENT_DAO_PARENT_SWITCH) {
+    } else if (event == RPL_EVENT_DAO_PARENT_ADD) {
         ws_address_registration_update(cur);
     }
     cur->ws_info->rpl_state = event;

source/RPL/rpl_control.h

@@ -35,7 +35,7 @@ typedef enum rpl_event {
     RPL_EVENT_DAO_DONE,         /* Simplistic trigger for bootstrap advance - a DAO registration completed */
     RPL_EVENT_LOCAL_REPAIR_START, /* RPL start scanning new parent by multicast DIS user can disable beacon request responser here*/
     RPL_EVENT_LOCAL_REPAIR_NO_MORE_DIS, /* RPL not sending DIS anymore user can report bootstrap error */
-    RPL_EVENT_DAO_PARENT_SWITCH, /* RPL indicate that DAO downward Parent state have been updated */
+    RPL_EVENT_DAO_PARENT_ADD, /* RPL indicate that DAO downward Parent has been added */
 } rpl_event_t;
 
 typedef void rpl_domain_callback_t(rpl_event_t event, void *handle);

source/RPL/rpl_downward.c

@@ -192,20 +192,18 @@ static bool rpl_instance_parent_selection_ready(rpl_instance_t *instance)
 
 void rpl_downward_neighbour_gone(rpl_instance_t *instance, rpl_neighbour_t *neighbour)
 {
-    if (neighbour->dao_path_control == 0) {
-        return;
-    }
-    neighbour->old_dao_path_control = neighbour->dao_path_control;
-    neighbour->dao_path_control = 0;
-    rpl_downward_process_dao_parent_changes(instance);
+
+    // Currently don't need to do anything - caller is expected to
+    // trigger parent selection, which will do everything required.
+    (void) instance;
+    (void) neighbour;
 }
 
 void rpl_downward_process_dao_parent_changes(rpl_instance_t *instance)
 {
-    uint8_t mop = rpl_instance_mop(instance);
     bool storing;
 
-    switch (mop) {
+    switch (rpl_instance_mop(instance)) {
         case RPL_MODE_NON_STORING:
             storing = false;
             break;
@@ -219,6 +217,7 @@ void rpl_downward_process_dao_parent_changes(rpl_instance_t *instance)
 
     bool bits_removed = false;
     uint8_t bits_added = 0;
+
     ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
         if (neighbour->old_dao_path_control != neighbour->dao_path_control) {
             if (neighbour->old_dao_path_control & ~ neighbour->dao_path_control) {
@@ -230,11 +229,21 @@ void rpl_downward_process_dao_parent_changes(rpl_instance_t *instance)
             }
         }
     }
-    tr_debug("removed=%x, added=%x", bits_removed, bits_added);
+
     if (!(bits_removed || bits_added)) {
         return;
     }
 
+    tr_debug("removed=%x, added=%x", bits_removed, bits_added);
+
+    ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
+        if (neighbour->dao_path_control != 0 && neighbour->old_dao_path_control == 0) {
+            //Candidate has become a DAO parent
+            rpl_control_event(instance->domain, RPL_EVENT_DAO_PARENT_ADD);
+            break;
+        }
+    }
+
     if (storing) {
         /* XXX more complicated - No-Paths to people losing stuff, etc.
          * Need to think a bit about what each parent would have had.
@@ -253,8 +262,8 @@ void rpl_downward_process_dao_parent_changes(rpl_instance_t *instance)
                 }
             }
         }
-        //GENERATE PARENT Update event
-        rpl_control_event(instance->domain, RPL_EVENT_DAO_PARENT_SWITCH);
+
+        //Trig DAO allways after change
         rpl_instance_dao_trigger(instance, 0);
     }
 }