Fixed aro registration error

RPL was left neighbor information if there was ARO error and that
neighbor was deleted. This caused loops in stack

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1276,7 +1276,6 @@ static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_en
 
     neighbor_buffer->ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor_buffer->neighbor->index);
     if (!neighbor_buffer->ws_neighbor) {
-        mac_helper_devicetable_remove(interface->mac_api, neighbor_buffer->neighbor->index);
         mac_neighbor_table_neighbor_remove(mac_neighbor_info(interface), neighbor_buffer->neighbor);
         return false;
     }
@@ -1551,6 +1550,7 @@ int ws_bootstrap_neighbor_remove(protocol_interface_info_entry_t *cur, const uin
     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);
 

source/RPL/rpl_control.c

@@ -237,6 +237,14 @@ 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);
+    }
+    return;
+}
 
 /* Address changes need to trigger DAO target re-evaluation */
 static void rpl_control_addr_notifier(struct protocol_interface_info_entry *interface, const if_address_entry_t *addr, if_address_callback_t reason)

source/RPL/rpl_control.h

@@ -150,6 +150,7 @@ 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]);
 
 /* 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]);

source/RPL/rpl_downward.c

@@ -625,6 +625,7 @@ bool rpl_instance_address_registration_done(protocol_interface_info_entry_t *int
             addr->state_timer = (addr->preferred_lifetime * randLIB_get_random_in_range(75, 85) / 10);
         } else {
             tr_error("Address registration failed");
+            rpl_delete_neighbour(instance, neighbour);
         }
 
         /* If that was last one to reply, send next one. */

source/RPL/rpl_upward.c

@@ -1577,6 +1577,15 @@ bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv
     }
     return false;
 }
+void rpl_instance_neighbor_delete(rpl_instance_t *instance, const uint8_t *ipv6_addr)
+{
+    ns_list_foreach_safe(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
+        if (addr_ipv6_equal(neighbour->ll_address, ipv6_addr)) {
+            rpl_delete_neighbour(instance, neighbour);
+        }
+    }
+    return;
+}
 
 void rpl_instance_slow_timer(rpl_instance_t *instance, uint16_t seconds)
 {

source/RPL/rpl_upward.h

@@ -84,6 +84,7 @@ void rpl_instance_set_local_repair(rpl_instance_t *instance, bool repair);
 bool rpl_instance_local_repair(const rpl_instance_t *instance);
 uint16_t rpl_instance_current_rank(const rpl_instance_t *instance);
 bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv6_addr);
+void rpl_instance_neighbor_delete(rpl_instance_t *instance, const uint8_t *ipv6_addr);
 void rpl_instance_slow_timer(rpl_instance_t *instance, uint16_t seconds);
 
 rpl_dodag_t *rpl_lookup_dodag(const rpl_instance_t *instance, const uint8_t *dodagid);

test/nanostack/unittest/stub/rpl_upward_stub.c

@@ -422,6 +422,9 @@ bool rpl_instance_address_is_parent(rpl_instance_t *instance, const uint8_t *ipv
 {
     return false;
 }
+void rpl_instance_neighbor_delete(rpl_instance_t *instance, const uint8_t *ipv6_addr)
+{
+}
 
 void rpl_instance_slow_timer(rpl_instance_t *instance, uint16_t seconds)
 {