Wi-sun address registration trigger update

Removed wi-sun address registaretion trigger from DHCP addressd status OK callback.

Fixed SLAAC address re-registration trigger.

Wi-sun will do address registartion periodically automatically. DHCP only start re-register timer.

Change-Id: I768c0eac494a598afa5178079180b7190b9e277a

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -153,17 +153,28 @@ static void ws_bootstrap_neighbor_list_clean(struct protocol_interface_info_entr
     mac_neighbor_table_neighbor_list_clean(mac_neighbor_info(interface));
 }
 
+static void ws_address_reregister_trig(struct protocol_interface_info_entry *interface)
+{
+    if (interface->ws_info->aro_registration_timer == 0) {
+        interface->ws_info->aro_registration_timer = WS_NEIGHBOR_NUD_TIMEOUT;
+    }
+}
+
 static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_entry *interface, const struct if_address_entry *addr, if_address_callback_t reason)
 {
     /* No need for LL address registration */
-    if (addr->source == ADDR_SOURCE_UNKNOWN) {
+    if (addr->source == ADDR_SOURCE_UNKNOWN || !interface->ws_info) {
         return;
     }
     if (reason == ADDR_CALLBACK_DAD_COMPLETE) {
         //Trig Address Registartion only when Bootstrap is ready
-        if (interface->nwk_bootstrap_state == ER_BOOTSRAP_DONE && addr->source != ADDR_SOURCE_DHCP) {
-            tr_debug("Address registration %s", trace_ipv6(addr->address));
-            ws_address_registration_update(interface, addr->address);
+        if (addr->source != ADDR_SOURCE_DHCP) {
+            if (interface->nwk_bootstrap_state == ER_BOOTSRAP_DONE) {
+                tr_debug("Address registration %s", trace_ipv6(addr->address));
+                ws_address_registration_update(interface, addr->address);
+            }
+            ws_address_reregister_trig(interface);
+
         }
         if (addr_ipv6_scope(addr->address, interface) > IPV6_SCOPE_LINK_LOCAL) {
             // at least ula address available inside mesh.
@@ -190,12 +201,6 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
                 break;
             }
         }
-    } else if (reason == ADDR_CALLBACK_TIMER) {
-        if (addr->source != ADDR_SOURCE_DHCP) {
-            tr_debug("Address Re registration %s", trace_ipv6(addr->address));
-            //Register
-            ws_address_registration_update(interface, addr->address);
-        }
     }
 }
 
@@ -2089,7 +2094,7 @@ static void ws_dhcp_client_global_adress_cb(int8_t interface, uint8_t dhcp_addr[
     if (register_status) {
         protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface);
         if (cur) {
-            ws_address_registration_update(cur, prefix);
+            ws_address_reregister_trig(cur);
         }
     } else {
         //Delete dhcpv6 client

source/RPL/rpl_downward.c

@@ -182,7 +182,7 @@ static 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) {
-        //We have a Primary parent with Dao patha control
+        //We have a Primary parent with Dao path control
         return true;
     }
     return false;