Created Wi-SUN specific NA handler

When NA failure for ARO is sent neighbor is deleted

Created public API to Wi-SUN to delete neighbor by Link Local address

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1634,11 +1634,6 @@ int ws_bootstrap_set_rf_config(protocol_interface_info_entry_t *cur, phy_rf_chan
 
 int ws_bootstrap_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
 {
-    tr_warn("ARO registration Failure %s", trace_ipv6(ll_address));
-
-    blacklist_update(ll_address, false);
-    rpl_control_neighbor_delete(cur, ll_address);
-
     mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_entry_get_by_ll64(mac_neighbor_info(cur), ll_address, false, NULL);
 
     if (mac_neighbor) {
@@ -1647,7 +1642,12 @@ int ws_bootstrap_neighbor_remove(protocol_interface_info_entry_t *cur, const uin
     return 0;
 }
 
-
+int ws_bootstrap_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
+{
+    blacklist_update(ll_address, false);
+    rpl_control_neighbor_delete(cur, ll_address);
+    return ws_bootstrap_neighbor_remove(cur, ll_address);
+}
 
 static void ws_bootstrap_mac_activate(protocol_interface_info_entry_t *cur, uint16_t channel, uint16_t panid, bool coordinator)
 {

source/6LoWPAN/ws/ws_bootstrap.h

@@ -43,6 +43,8 @@ int ws_bootstrap_set_rf_config(protocol_interface_info_entry_t *cur, phy_rf_chan
 
 int ws_bootstrap_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
 
+int ws_bootstrap_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
+
 /*State machine transactions*/
 void ws_bootstrap_event_discovery_start(protocol_interface_info_entry_t *cur);
 
@@ -82,6 +84,7 @@ void ws_bootstrap_eapol_parent_synch(struct protocol_interface_info_entry *cur,
 #define ws_bootstrap_state_machine(cur)
 #define ws_bootstrap_restart(cur)
 #define ws_bootstrap_neighbor_remove(cur, ll_address)
+#define ws_bootstrap_aro_failure(cur, ll_address)
 #define ws_primary_parent_update(interface, neighbor)
 #define ws_secondary_parent_update(interface)
 

source/6LoWPAN/ws/ws_common.c

@@ -354,10 +354,15 @@ void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8
 
 void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
 {
-    //Neighbor connectected update
-    ws_bootstrap_neighbor_remove(cur, ll_address);
+    tr_warn("ARO registration Failure %s", trace_ipv6(ll_address));
+    ws_bootstrap_aro_failure(cur, ll_address);
 }
 
+void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
+{
+    tr_debug("neighbor remove %s", trace_ipv6(ll_address));
+    ws_bootstrap_neighbor_remove(cur, ll_address);
+}
 bool ws_common_allow_child_registration(protocol_interface_info_entry_t *interface)
 {
     uint8_t child_count = 0;

source/6LoWPAN/ws/ws_common.h

@@ -119,6 +119,8 @@ void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8
 
 void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
 
+void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
+
 bool ws_common_allow_child_registration(protocol_interface_info_entry_t *cur);
 
 #define ws_info(cur) ((cur)->ws_info)
@@ -127,6 +129,7 @@ bool ws_common_allow_child_registration(protocol_interface_info_entry_t *cur);
 #define ws_common_seconds_timer(cur, seconds)
 #define ws_common_neighbor_update(cur, ll_address) ((void) 0)
 #define ws_common_aro_failure(cur, ll_address)
+#define ws_common_neighbor_remove(cur, ll_address)
 #define ws_common_fast_timer(cur, ticks) ((void) 0)
 #define ws_common_allow_child_registration(cur) (false)
 

source/Common_Protocols/icmpv6.c

@@ -1353,6 +1353,29 @@ void ack_receive_cb(struct buffer *buffer_ptr, uint8_t status)
         ws_common_neighbor_update(buffer_ptr->interface, ll_target);
     }
 }
+void ack_remove_neighbour_cb(struct buffer *buffer_ptr, uint8_t status)
+{
+    /*icmpv6_na_handler functionality based on ACK*/
+    uint8_t ll_target[16];
+    (void)status;
+
+    if (buffer_ptr->dst_sa.addr_type == ADDR_IPV6) {
+        /*Full IPv6 address*/
+        memcpy(ll_target, buffer_ptr->dst_sa.address, 16);
+    } else if (buffer_ptr->dst_sa.addr_type == ADDR_802_15_4_LONG) {
+        // Build link local address from long MAC address
+        memcpy(ll_target, ADDR_LINK_LOCAL_PREFIX, 8);
+        memcpy(ll_target + 8, &buffer_ptr->dst_sa.address[2], 8);
+        ll_target[8] ^= 2;
+    } else {
+        tr_warn("wrong address %d %s", buffer_ptr->dst_sa.addr_type, trace_array(buffer_ptr->dst_sa.address, 16));
+        return;
+    }
+    if (ws_info(buffer_ptr->interface)) {
+        ws_common_neighbor_remove(buffer_ptr->interface, ll_target);
+    }
+
+}
 
 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)
 {
@@ -1660,6 +1683,11 @@ buffer_t *icmpv6_build_na(protocol_interface_info_entry_t *cur, bool solicited,
         memcpy(ptr, aro->eui64, 8);
         ptr += 8;
     }
+    if (ws_info(cur) && aro && aro->status != ARO_SUCCESS) {
+        /*If Aro failed we will kill the neigbour after we have succeeded in sending message*/
+        buf->ack_receive_cb = ack_remove_neighbour_cb;
+    }
+
     //Force Next Hop is destination
     ipv6_buffer_route_to(buf, buf->dst_sa.address, cur);
 

test/nanostack/unittest/stub/ws_common_stub.c

@@ -71,5 +71,9 @@ void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *
 {
     (void) cur;
     (void) ll_address;
-
+}
+void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
+{
+    (void) cur;
+    (void) ll_address;
 }