Wi-sun address registartion update

ARO registartion will return new status if bootsrtap is not ready.

Only Cache full status remove neighbour.

Change-Id: I52fe7c21fd77f5f5ee208f2e976d227ba2f645f6

Author: Juha Heiskanen

source/6LoWPAN/ND/nd_router_object.c

@@ -928,11 +928,13 @@ bool nd_ns_aro_handler(protocol_interface_info_entry_t *cur_interface, const uin
     }
 
     /* TODO - check hard upper limit on registrations? */
-    if (ws_info(cur_interface) &&
-            !ws_common_allow_child_registration(cur_interface, aro_out->eui64)) {
-        aro_out->present = true;
-        aro_out->status = ARO_FULL;
-        return true;
+    if (ws_info(cur_interface)) {
+
+        aro_out->status = ws_common_allow_child_registration(cur_interface, aro_out->eui64);
+        if (aro_out->status != ARO_SUCCESS) {
+            aro_out->present = true;
+            return true;
+        }
     }
 
     /* We need to have entry in the Neighbour Cache */

source/6LoWPAN/ws/ws_common.c

@@ -22,6 +22,7 @@
 #include "randLIB.h"
 #include <ns_list.h>
 #include <nsdynmemLIB.h>
+#include "Common_Protocols/icmpv6.h"
 #include "6LoWPAN/ws/ws_config.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_common.h"
@@ -405,7 +406,7 @@ void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8
 
 
 
-bool ws_common_allow_child_registration(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
+uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
 {
     uint8_t child_count = 0;
     uint8_t max_child_count = mac_neighbor_info(interface)->list_total_size - WS_NON_CHILD_NEIGHBOUR_COUNT;
@@ -418,13 +419,13 @@ bool ws_common_allow_child_registration(protocol_interface_info_entry_t *interfa
     //Validate Is EUI64 already allocated for any address
     if (ipv6_neighbour_has_registered_by_eui64(&interface->ipv6_neighbour_cache, eui64)) {
         tr_info("Child registration from old child");
-        return true;
+        return ARO_SUCCESS;
     }
 
     //Verify that we have Selected Parent
     if (interface->bootsrap_mode != ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER && !rpl_control_parent_candidate_list_size(interface, true)) {
         tr_info("Do not accept new ARO child: no selected parent");
-        return false;
+        return ARO_TOPOLOGICALLY_INCORRECT;
     }
 
 
@@ -436,10 +437,10 @@ bool ws_common_allow_child_registration(protocol_interface_info_entry_t *interfa
     }
     if (child_count >= max_child_count) {
         tr_warn("Child registration not allowed %d/%d, max:%d", child_count, max_child_count, mac_neighbor_info(interface)->list_total_size);
-        return false;
+        return ARO_FULL;
     }
     tr_info("Child registration allowed %d/%d, max:%d", child_count, max_child_count, mac_neighbor_info(interface)->list_total_size);
-    return true;
+    return ARO_SUCCESS;
 }
 
 bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
@@ -448,6 +449,7 @@ bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, con
     if (!neighbour) {
         return false;
     }
+
     ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbour->index);
     ws_neighbor->negative_aro_send = true;
     neighbour->lifetime = WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT_SMALL; //Remove anyway if Packet is freed before MAC push

source/6LoWPAN/ws/ws_common.h

@@ -141,7 +141,7 @@ void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *
 
 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, const uint8_t *eui64);
+uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *cur, const uint8_t *eui64);
 
 bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, const uint8_t *eui64);
 
@@ -158,7 +158,7 @@ uint32_t ws_common_version_timeout_get(uint8_t config);
 #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, eui64) (false)
+#define ws_common_allow_child_registration(cur, eui64) (2)
 #define ws_common_negative_aro_mark(interface, eui64)(false)
 
 #endif //HAVE_WS

source/Common_Protocols/icmpv6.c

@@ -1697,7 +1697,7 @@ 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 (ws_info(cur) && aro && (aro->status != ARO_SUCCESS && aro->status != ARO_TOPOLOGICALLY_INCORRECT)) {
         /*If Aro failed we will kill the neigbour after we have succeeded in sending message*/
         if (!ws_common_negative_aro_mark(cur, aro->eui64)) {
             tr_debug("Neighbour removed for negative response send");

source/Common_Protocols/icmpv6.h

@@ -117,6 +117,7 @@ typedef enum slaac_src {
 #define ARO_SUCCESS     0
 #define ARO_DUPLICATE   1
 #define ARO_FULL        2
+#define ARO_TOPOLOGICALLY_INCORRECT 8
 
 extern void icmpv6_init(void);
 extern struct buffer *icmpv6_down(struct buffer *buf);

test/nanostack/unittest/stub/ws_common_stub.c

@@ -62,10 +62,10 @@ void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8
     (void) cur;
     (void) ll_address;
 }
-bool ws_common_allow_child_registration(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
+uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
 {
     (void) interface;
-    return true;
+    return 0;
 }
 void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
 {