Wi-sun address registration and RPL update

Fixed broken negative ARO handler call to RPL

RPL new policy for request parent confirmation before send DAO.

Moved ARO registartion code inside RPL instance.

New solution will trigger NS one by one. Process is a little abit slower but more controlled and failure safe.

DHCPv6 address register is triggered now with DHCPv6 status callback only.

Change-Id: I36280463738e5349ab9f6bf4dc3863a644537f98

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -147,8 +147,9 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
     }
     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) {
-            ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, (void *)addr);
+        if (interface->nwk_bootstrap_state == ER_BOOTSRAP_DONE && addr->source != ADDR_SOURCE_DHCP) {
+            tr_debug("Address registration %s", trace_ipv6(addr->address));
+            rpl_control_register_address(interface, addr->address);
         }
         if (addr_ipv6_scope(addr->address, interface) > IPV6_SCOPE_LINK_LOCAL) {
             // at least ula address available inside mesh.
@@ -170,12 +171,10 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
             }
         }
     } else if (reason == ADDR_CALLBACK_TIMER) {
-        tr_debug("Address Re registration %s", trace_ipv6(addr->address));
-
-        if (!interface->ws_info->address_registration_event_active) {
-            interface->ws_info->address_registration_event_active = true;
-            tr_info("Register ARO");
-            ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
+        if (addr->source != ADDR_SOURCE_DHCP) {
+            tr_debug("Address Re registration %s", trace_ipv6(addr->address));
+            //Register
+            rpl_control_register_address(interface, addr->address);
         }
     }
 }
@@ -1807,11 +1806,8 @@ static void ws_set_fhss_hop(protocol_interface_info_entry_t *cur)
 
 static void ws_address_registration_update(protocol_interface_info_entry_t *interface)
 {
-    if (!interface->ws_info->address_registration_event_active) {
-        interface->ws_info->address_registration_event_active = true;
-        tr_info("RPL parent update ... register ARO");
-        ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
-    }
+    rpl_control_register_address(interface, NULL);
+    tr_info("RPL parent update ... register ARO");
 }
 
 static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
@@ -1864,7 +1860,13 @@ static void ws_dhcp_client_global_adress_cb(int8_t interface, uint8_t dhcp_addr[
     (void)prefix;
     (void)interface;
     //TODO add handler for negative status
-    tr_debug("DHCPv6 %s status %u", trace_ipv6(dhcp_addr), register_status);
+    tr_debug("DHCPv6 %s status %u with link %s", trace_ipv6(prefix), register_status, trace_ipv6(dhcp_addr));
+    if (register_status) {
+        protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface);
+        if (cur) {
+            rpl_control_register_address(cur, prefix);
+        }
+    }
 }
 
 
@@ -1936,6 +1938,7 @@ static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
     rpl_control_set_callback(protocol_6lowpan_rpl_domain, ws_bootstrap_rpl_callback, ws_rpl_prefix_callback, cur);
     // If i am router I Do this
     rpl_control_force_leaf(protocol_6lowpan_rpl_domain, leaf);
+    rpl_control_request_parent_link_confirmation(true);
 
     cur->ws_info->rpl_state = 0xff; // Set invalid state and learn from event
 }
@@ -2287,17 +2290,6 @@ static void ws_bootstrap_pan_config(protocol_interface_info_entry_t *cur)
     ws_llc_asynch_request(cur, &async_req);
 }
 
-static bool ws_bootstrap_address_registration_ongoing(protocol_interface_info_entry_t *cur)
-{
-    ns_list_foreach(if_address_entry_t, addr, &cur->ip_addresses) {
-        if (addr->addr_reg_pend != 0) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 static void ws_bootstrap_event_handler(arm_event_s *event)
 {
     ws_bootsrap_event_type_e event_type;
@@ -2421,12 +2413,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             ws_bootstrap_advertise_start(cur);
             ws_bootstrap_state_change(cur, ER_BOOTSRAP_DONE);
             break;
-        case WS_ADDRESS_ADDED:
-            cur->ws_info->address_registration_event_active = false;
-            if (!ws_bootstrap_address_registration_ongoing(cur)) {
-                rpl_control_register_address(cur, (if_address_entry_t *) event->data_ptr);
-            }
-            break;
+
         default:
             tr_err("Invalid event received");
             break;

source/6LoWPAN/ws/ws_bootstrap.h

@@ -24,8 +24,7 @@ typedef enum {
     WS_DISCOVERY_START,      /**< discovery start*/
     WS_CONFIGURATION_START,  /**< configuration learn start*/
     WS_OPERATION_START,      /**< active operation start*/
-    WS_ROUTING_READY,        /**< RPL routing connected to BR*/
-    WS_ADDRESS_ADDED         /**< Address added to IF*/
+    WS_ROUTING_READY        /**< RPL routing connected to BR*/
 } ws_bootsrap_event_type_e;
 
 #ifdef HAVE_WS

source/6LoWPAN/ws/ws_common.h

@@ -73,7 +73,6 @@ typedef struct ws_info_s {
     uint32_t pan_version_timer;            /**< border router version udate timeout */
     uint32_t pan_version_timeout_timer;    /**< routers will fallback to previous state after this */
     uint8_t gtkhash[32];
-    bool address_registration_event_active : 1;
     bool configuration_learned: 1;
     bool trickle_pas_running: 1;
     bool trickle_pa_running: 1;

source/Common_Protocols/icmpv6.c

@@ -1369,6 +1369,21 @@ void ack_remove_neighbour_cb(struct buffer *buffer_ptr, uint8_t status)
 
 }
 
+static void icmpv6_aro_cb(buffer_t *buf, uint8_t status)
+{
+    uint8_t ll_address[16];
+    if (buf->dst_sa.addr_type == ADDR_IPV6) {
+        /*Full IPv6 address*/
+        memcpy(ll_address, buf->dst_sa.address, 16);
+    } else if (buf->dst_sa.addr_type == ADDR_802_15_4_LONG) {
+        // Build link local address from long MAC address
+        memcpy(ll_address, ADDR_LINK_LOCAL_PREFIX, 8);
+        memcpy(ll_address + 8, &buf->dst_sa.address[2], 8);
+        ll_address[8] ^= 2;
+    }
+    rpl_control_address_register_done(buf->interface, ll_address, status);
+}
+
 buffer_t *icmpv6_build_ns(protocol_interface_info_entry_t *cur, const uint8_t target_addr[16], const uint8_t *prompting_src_addr, bool unicast, bool unspecified_source, const aro_t *aro)
 {
     if (!cur || addr_is_ipv6_multicast(target_addr)) {
@@ -1444,7 +1459,7 @@ buffer_t *icmpv6_build_ns(protocol_interface_info_entry_t *cur, const uint8_t ta
         /* If ARO Success sending is omitted, MAC ACK is used instead */
         /* Setting callback for receiving ACK from adaptation layer */
         if (aro && cur->ipv6_neighbour_cache.omit_na_aro_success) {
-            buf->ack_receive_cb = rpl_control_address_register_done;
+            buf->ack_receive_cb = icmpv6_aro_cb;
         }
     }
     if (unicast && (!aro && cur->ipv6_neighbour_cache.omit_na)) {

source/RPL/rpl_control.c

@@ -171,47 +171,32 @@ void rpl_control_unpublish_address(rpl_domain_t *domain, const uint8_t addr[16])
     }
 }
 
-static if_address_entry_t *rpl_instance_reg_addr_get(protocol_interface_info_entry_t *interface)
+void rpl_control_request_parent_link_confirmation(bool requested)
 {
-    ns_list_foreach(if_address_entry_t, address, &interface->ip_addresses) {
-        if (!address->addr_reg_done && !addr_is_ipv6_link_local(address->address)) {
-            return address;
-        }
-    }
-
-    return NULL;
+    rpl_policy_set_parent_confirmation_request(requested);
 }
 
 /* Send address registration to either specified address, or to non-registered address */
-void rpl_control_register_address(protocol_interface_info_entry_t *interface, if_address_entry_t *addr)
+void rpl_control_register_address(protocol_interface_info_entry_t *interface, const uint8_t addr[16])
 {
-    if_address_entry_t *reg_addr = addr;
-
-    if (!reg_addr) {
-        reg_addr = rpl_instance_reg_addr_get(interface);
-
-        if (!reg_addr) {
-            return;
-        }
+    if (!rpl_policy_parent_confirmation_requested()) {
+        return;
     }
     ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
-        rpl_instance_send_address_registration(interface, instance, reg_addr);
+        rpl_instance_send_address_registration(instance, addr);
     }
 }
 
-void rpl_control_address_register_done(struct buffer *buf, uint8_t status)
+void rpl_control_address_register_done(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16], uint8_t status)
 {
-    ns_list_foreach(if_address_entry_t, addr, &buf->interface->ip_addresses) {
-
-        /* Optimize, ll addresses are not registered anyway.. */
-        if (!addr->addr_reg_pend) {
-            continue;
-        }
+    if (!rpl_policy_parent_confirmation_requested()) {
+        return;
+    }
 
-        ns_list_foreach(struct rpl_instance, instance, &buf->interface->rpl_domain->instances) {
-            if (rpl_instance_address_registration_done(buf->interface, instance, addr, status)) {
-                return;
-            }
+    ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
+        rpl_neighbour_t *neighbour = rpl_lookup_neighbour_by_ll_address(instance, ll_addr, interface->id);
+        if (neighbour) {
+            rpl_instance_address_registration_done(interface, instance, neighbour, status);
         }
     }
 }
@@ -226,13 +211,17 @@ bool rpl_control_is_dodag_parent(protocol_interface_info_entry_t *interface, con
     }
     return false;
 }
+
 void rpl_control_neighbor_delete(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16])
 {
     // go through instances and delete address.
     ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
-        rpl_instance_neighbor_delete(instance, ll_addr);
+
+        rpl_neighbour_t *neighbour = rpl_lookup_neighbour_by_ll_address(instance, ll_addr, interface->id);
+        if (neighbour) {
+            rpl_delete_neighbour(instance, neighbour);
+        }
     }
-    return;
 }
 
 /* Address changes need to trigger DAO target re-evaluation */

source/RPL/rpl_control.h

@@ -147,10 +147,12 @@ 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]);
-void rpl_control_register_address(struct protocol_interface_info_entry *interface, if_address_entry_t *addr);
-void rpl_control_address_register_done(struct buffer *buf, uint8_t status);
 bool rpl_control_is_dodag_parent(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
 void rpl_control_neighbor_delete(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
+/* Parent link confirmation API extension */
+void rpl_control_request_parent_link_confirmation(bool requested);
+void rpl_control_register_address(struct protocol_interface_info_entry *interface, const uint8_t addr[16]);
+void rpl_control_address_register_done(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16], uint8_t status);
 
 /* Configure and return the routing lookup predicate for a specified RPL instance ID */
 ipv6_route_predicate_fn_t *rpl_control_get_route_predicate(rpl_domain_t *domain, uint8_t instance_id, const uint8_t src[16], const uint8_t dst[16]);
@@ -172,7 +174,7 @@ uint16_t rpl_control_current_rank(const struct rpl_instance *instance);
 #define rpl_control_slow_timer(seconds) ((void) 0)
 #define rpl_control_remove_domain_from_interface(cur) ((void) 0)
 #define rpl_control_register_address(interface, addr) ((void) 0)
-#define rpl_control_address_register_done NULL
+#define rpl_control_address_register_done(interface, ll_addr, status) ((void) 0)
 
 #endif /* HAVE_RPL */