Wi-SUN Aro registration temporary address registation bug fix.

Fixed That ARO lifetime 1 is not create temporary entry to normal neighbor.

Author: Juha Heiuskanen

source/6LoWPAN/ND/nd_router_object.c

@@ -930,7 +930,7 @@ 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)) {
 
-        aro_out->status = ws_common_allow_child_registration(cur_interface, aro_out->eui64);
+        aro_out->status = ws_common_allow_child_registration(cur_interface, aro_out->eui64, aro_out->lifetime);
         if (aro_out->status != ARO_SUCCESS) {
             aro_out->present = true;
             return true;

source/6LoWPAN/ws/ws_bootstrap.c

@@ -163,7 +163,7 @@ void ws_bootstrap_mac_neighbor_short_time_set(struct protocol_interface_info_ent
 {
     mac_neighbor_table_entry_t *neighbor = mac_neighbor_table_address_discover(mac_neighbor_info(interface), src64, MAC_ADDR_MODE_64_BIT);
 
-    if (neighbor && neighbor->link_lifetime != WS_NEIGHBOR_LINK_TIMEOUT) {
+    if (neighbor && neighbor->link_lifetime <= valid_time) {
         //mlme_device_descriptor_t device_desc;
         neighbor->lifetime = valid_time;
         neighbor->link_lifetime = valid_time;

source/6LoWPAN/ws/ws_common.c

@@ -390,38 +390,51 @@ uint8_t ws_common_temporary_entry_size(uint8_t mac_table_size)
     }
 }
 
-static void ws_common_neighbour_address_reg_link_update(protocol_interface_info_entry_t *interface, const uint8_t *eui64)
+static void ws_common_neighbour_address_reg_link_update(protocol_interface_info_entry_t *interface, const uint8_t *eui64, uint32_t link_lifetime)
 {
+    if (link_lifetime > WS_NEIGHBOR_LINK_TIMEOUT) {
+        link_lifetime = WS_NEIGHBOR_LINK_TIMEOUT;
+    }
     /*
      * ARO registration from child can update the link timeout so we don't need to send extra NUD if ARO received
      */
     mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_entry_get_by_mac64(mac_neighbor_info(interface), eui64, false, false);
 
     if (mac_neighbor) {
-        if (mac_neighbor->link_lifetime != WS_NEIGHBOR_LINK_TIMEOUT) {
+        if (mac_neighbor->link_lifetime < link_lifetime) {
             //Set Stable timeout for temporary entry here
+            if (link_lifetime > WS_NEIGHBOUR_TEMPORARY_NEIGH_MAX_LIFETIME && mac_neighbor->link_lifetime  < WS_NEIGHBOUR_TEMPORARY_NEIGH_MAX_LIFETIME) {
+                tr_info("Added new neighbor %s : index:%u", trace_array(eui64, 8), mac_neighbor->index);
+            }
             mac_neighbor->link_lifetime = WS_NEIGHBOR_LINK_TIMEOUT;
-            tr_info("Added new neighbor %s : index:%u", trace_array(eui64, 8), mac_neighbor->index);
+
         }
         //Refresh
         mac_neighbor->lifetime = mac_neighbor->link_lifetime;
     }
 }
 
-uint8_t 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, uint16_t aro_timeout)
 {
     uint8_t child_count = 0;
     uint8_t max_child_count = mac_neighbor_info(interface)->list_total_size - ws_common_temporary_entry_size(mac_neighbor_info(interface)->list_total_size);
 
+    if (aro_timeout == 0) {
+        //DeRegister Address Reg
+        return ARO_SUCCESS;
+    }
+    uint32_t link_lifetime = (aro_timeout * 60) + 1;
+
     // Test API to limit child count
     if (test_max_child_count_override != 0xffff) {
         max_child_count = test_max_child_count_override;
     }
 
     //Validate Is EUI64 already allocated for any address
     if (ipv6_neighbour_has_registered_by_eui64(&interface->ipv6_neighbour_cache, eui64)) {
-        ws_common_neighbour_address_reg_link_update(interface, eui64);
+        ws_common_neighbour_address_reg_link_update(interface, eui64, link_lifetime);
         tr_info("Child registration from old child");
+
         return ARO_SUCCESS;
     }
 
@@ -431,20 +444,21 @@ uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *inte
         return ARO_TOPOLOGICALLY_INCORRECT;
     }
 
-
     ns_list_foreach_safe(mac_neighbor_table_entry_t, cur, &mac_neighbor_info(interface)->neighbour_list) {
 
         if (ipv6_neighbour_has_registered_by_eui64(&interface->ipv6_neighbour_cache, cur->mac64)) {
             child_count++;
         }
     }
+
     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 ARO_FULL;
     }
 
-    ws_common_neighbour_address_reg_link_update(interface, eui64);
+    ws_common_neighbour_address_reg_link_update(interface, eui64, link_lifetime);
     tr_info("Child registration allowed %d/%d, max:%d", child_count, max_child_count, mac_neighbor_info(interface)->list_total_size);
+
     return ARO_SUCCESS;
 }
 

source/6LoWPAN/ws/ws_common.h

@@ -148,7 +148,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);
 
-uint8_t 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, uint16_t aro_timeout);
 
 bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, const uint8_t *eui64);
 
@@ -173,7 +173,7 @@ uint8_t ws_common_temporary_entry_size(uint8_t mac_table_size);
 #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) (2)
+#define ws_common_allow_child_registration(cur, eui64, aro_timeout) (2)
 #define ws_common_negative_aro_mark(interface, eui64)(false)
 #define ws_common_latency_estimate_get(cur) 0
 #define ws_common_datarate_get(cur) 0

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -537,7 +537,7 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
                 ws_llc_mpx_eapol_send(base, message);
             }
         } else {
-            if (neighbor_info.ws_neighbor && neighbor_info.neighbor && neighbor_info.neighbor->link_lifetime < WS_NEIGHBOUR_TEMPORARY_NEIGH_MAX_LIFETIME) {
+            if (neighbor_info.ws_neighbor && neighbor_info.neighbor && neighbor_info.neighbor->link_lifetime <= WS_NEIGHBOUR_DHCP_ENTRY_LIFETIME) {
                 //Remove temp neighbour
                 tr_debug("Remove Temp Entry by TX confirm");
                 mac_neighbor_table_neighbor_remove(mac_neighbor_info(interface), neighbor_info.neighbor);

test/nanostack/unittest/stub/ws_common_stub.c

@@ -64,7 +64,7 @@ void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8
     (void) cur;
     (void) ll_address;
 }
-uint8_t 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, uint16_t aro_timeout)
 {
     (void) interface;
     return 0;