Fixed interop findings for DUA handling

Save parent version number
if attached to parent that does not support DUA start own registration timers

Author: Mika Tervonen

source/6LoWPAN/Thread/thread_address_registration_client.c

@@ -41,6 +41,7 @@
 #include "thread_management_if.h"
 #include "thread_tmfcop_lib.h"
 #include "coap_service_api.h"
+#include "6LoWPAN/Thread/thread_extension_constants.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/Thread/thread_joiner_application.h"
 #include "6LoWPAN/Thread/thread_network_data_lib.h"
@@ -67,6 +68,11 @@ void thread_address_registration_init()
     mlr_timer = 0;
 }
 
+bool thread_address_registration_running()
+{
+    return enabled;
+}
+
 void thread_address_registration_deinit()
 {
     enabled = false;
@@ -87,9 +93,19 @@ void thread_address_registration_timer(protocol_interface_info_entry_t *interfac
 {
     uint32_t mlr_timeout;
     uint32_t delay_timer;
-    if (!enabled || !thread_extension_version_check(interface->thread_info->version)) {
+    if (!enabled || interface->thread_info->version < THREAD_VERSION_1_2) {
         return;
     }
+    if (thread_bootstrap_should_register_address(interface)) {
+        if (!interface->thread_info->thread_endnode_parent) {
+            // We dont have parent so skip
+            return;
+        }
+        if (interface->thread_info->thread_endnode_parent->version >= THREAD_VERSION_1_2) {
+            // Parent supports all features
+            return;
+        }
+    }
 
     if (0 != thread_extension_primary_bbr_get(interface, NULL, NULL, &mlr_timeout, &delay_timer)) {
         // BBR not present

source/6LoWPAN/Thread/thread_address_registration_client.h

@@ -34,13 +34,15 @@
 #ifdef HAVE_THREAD_V2
 
 void thread_address_registration_init(void);
+bool thread_address_registration_running(void);
 void thread_address_registration_deinit(void);
 
 void thread_address_registration_timer_set(protocol_interface_info_entry_t *interface, uint16_t dua_delay_seconds, uint16_t mlr_refresh_seconds);
 void thread_address_registration_timer(protocol_interface_info_entry_t *interface, uint16_t seconds);
 #else
 
 #define thread_address_registration_init(void)
+#define thread_address_registration_running(void)
 #define thread_address_registration_deinit(void)
 
 #define thread_address_registration_timer_set(interface, dua_delay_seconds, mlr_refresh_seconds);

source/6LoWPAN/Thread/thread_common.c

@@ -988,11 +988,7 @@ void thread_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t ticks)
     thread_resolution_client_timer(cur->id, ticks);
     thread_key_switch_timer(cur, ticks);
     thread_child_update_req_timer(cur, ticks);
-
-    if (!thread_bootstrap_should_register_address(cur)) {
-        /* Only FTD refreshes the address registration timer */
-        thread_address_registration_timer(cur, ticks);
-    }
+    thread_address_registration_timer(cur, ticks);
 
     if (thread_attach_ready(cur) != 0) {
         return;

source/6LoWPAN/Thread/thread_common.h

@@ -192,6 +192,7 @@ typedef struct thread_connectivity_s {
 typedef struct thread_parent_info_s {
     uint8_t mac64[8];
     uint16_t shortAddress;
+    uint16_t version;
     uint8_t router_id;
     uint8_t pathCostToLeader;
     bool    childUpdatePending: 1;

source/6LoWPAN/Thread/thread_extension.c

@@ -642,6 +642,35 @@ void thread_extension_address_registration(struct protocol_interface_info_entry
 #endif
 }
 
+void thread_extension_child_address_registration_response_process(struct protocol_interface_info_entry *interface)
+{
+    //  if we are version 3 and parent is lower we need to send registrations for them
+
+    if (interface->thread_info->version < THREAD_VERSION_1_2) {
+        thread_address_registration_deinit();
+        return;
+    }
+    if (!interface->thread_info->thread_endnode_parent) {
+        // We dont have parent return
+        thread_address_registration_deinit();
+        return;
+    }
+    if (interface->thread_info->thread_endnode_parent->version >= THREAD_VERSION_1_2) {
+        //parent supports 1.2
+        thread_address_registration_deinit();
+        return;
+    }
+    // We will start address registration timers
+
+    if (!thread_address_registration_running()) {
+        uint32_t dua_delay = randLIB_get_random_in_range(1, 5);
+        thread_extension_primary_bbr_get(interface, NULL, NULL, NULL, &dua_delay);
+
+        thread_address_registration_init();
+        thread_address_registration_timer_set(interface, 1 + randLIB_get_random_in_range(0, dua_delay / 1000), randLIB_get_random_in_range(1, 5));
+    }
+}
+
 void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, const uint8_t *domain_prefix, uint8_t domain_prefix_len)
 {
     if_address_entry_t *def_address = NULL;

source/6LoWPAN/Thread/thread_extension.h

@@ -49,6 +49,7 @@ void thread_extension_mtd_service_register(protocol_interface_info_entry_t *cur)
 void thread_extension_network_data_process(struct protocol_interface_info_entry *cur);
 int thread_extension_primary_bbr_get(struct protocol_interface_info_entry *cur, uint8_t *addr_ptr, uint8_t *seq_ptr, uint32_t *timer1_ptr, uint32_t *timer2_ptr);
 void thread_extension_address_registration(struct protocol_interface_info_entry *interface, const uint8_t *addr, const uint8_t *child_mac64, bool refresh_child_entry, bool duplicate_child_detected);
+void thread_extension_child_address_registration_response_process(struct protocol_interface_info_entry *interface);
 void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, const uint8_t *domain_prefix, uint8_t domain_prefix_len);
 void thread_extension_aloc_generate(struct protocol_interface_info_entry *cur);
 bool thread_extension_aloc_map(protocol_interface_info_entry_t *cur, uint16_t *addr16);
@@ -80,6 +81,7 @@ uint8_t *thread_extension_discover_response_write(protocol_interface_info_entry_
 #define thread_extension_network_data_process(cur) ((void) 0)
 #define thread_extension_primary_bbr_get(cur,addr_ptr,seq_ptr,timer1_ptr, timer2_ptr) (-1)
 #define thread_extension_address_registration(interface,addr,child_mac64,refresh_child_entry,duplicate_child_detected) ((void) 0)
+#define thread_extension_child_address_registration_response_process(interface) ((void) 0)
 #define thread_extension_aloc_generate(cur) ((void) 0)
 #define thread_extension_aloc_map(cur, addr16) (false)
 #define thread_extension_mcast_subscrition_change(interface) ((void) 0)

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -897,6 +897,7 @@ static void thread_mle_child_request_receive_cb(int8_t interface_id, mle_message
             parent->shortAddress = scan_result->shortAddress;
             parent->router_id = (scan_result->shortAddress >> 10);
             memcpy(parent->mac64, scan_result->mac64, 8);
+            parent->version = scan_result->version;
             //Check Network Data TLV
             if (networkDataTlv.tlvType == MLE_TYPE_NETWORK_DATA) {
                 thread_bootstrap_network_data_save(cur, &leaderData, networkDataTlv.dataPtr, networkDataTlv.tlvLen);

source/6LoWPAN/Thread/thread_mle_message_handler.c

@@ -744,6 +744,7 @@ static bool thread_address_registration_tlv_check(protocol_interface_info_entry_
             }
         }
     }
+    thread_extension_child_address_registration_response_process(cur);
 
     return ret_val;
 }