Pending set after link sync (ARMmbed#1526)

Pending configuration synced after router restart using
data request and data response.

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -1427,9 +1427,9 @@ static void thread_bootstrap_generate_leader_and_link(protocol_interface_info_en
 static int8_t thread_bootstrap_attempt_attach_with_pending_set(protocol_interface_info_entry_t *cur)
 {
     tr_debug("Attempting to attach with pending set");
-    uint32_t pending_timestamp = thread_joiner_application_pending_config_timeout_get(cur->id);
-    if (pending_timestamp > 0) {
-        tr_debug("We have a pending timestamp running");
+    uint32_t pending_delay_timer = thread_joiner_application_pending_config_timeout_get(cur->id);
+    if (pending_delay_timer > 0 && thread_joiner_application_pending_delay_timer_in_sync(cur->id)) {
+        tr_debug("We have a pending delay timer running");
         //we already have a pending set that can be activated so return
         return -1;
     }

source/6LoWPAN/Thread/thread_common.c

@@ -1660,7 +1660,6 @@ bool thread_pending_operational_dataset_process(protocol_interface_info_entry_t
         tr_error("pending set creation failed");
         return false;
     }
-
     tr_debug("updating pending dataset");
     thread_joiner_application_pending_config_timestamp_set(cur->id,mle_pending_timestamp);
     thread_joiner_application_pending_config_enable(cur->id,delay_timer);

source/6LoWPAN/Thread/thread_common.h

@@ -304,6 +304,7 @@ typedef struct thread_info_s {
     bool networkDataRequested: 1;
     bool end_device_link_synch: 1;
     bool router_mc_addrs_registered: 1;
+    bool leader_synced:1; // flag used by leader after restart
 } thread_info_t;
 
 #ifdef HAVE_THREAD

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -407,9 +407,9 @@ static void thread_child_synch_receive_cb(int8_t interface_id, mle_message_t *ml
         tr_debug("End device synch Possible");
 
         cur->thread_info->thread_attached_state = THREAD_STATE_CONNECTED;
-
+        // read network data, and leader data check. Send data request sent if pending set is not in sync
         if (mle_tlv_read_tlv(MLE_TYPE_NETWORK_DATA, mle_msg->data_ptr, mle_msg->data_length, &networkDataTlv) &&
-            thread_leader_data_parse(mle_msg->data_ptr, mle_msg->data_length, &leaderData)) {
+            thread_leader_data_parse(mle_msg->data_ptr, mle_msg->data_length, &leaderData) && thread_joiner_application_pending_delay_timer_in_sync(cur->id)) {
             thread_bootstrap_network_data_save(cur, &leaderData, networkDataTlv.dataPtr, networkDataTlv.tlvLen);
         } else {
             thread_bootstrap_parent_network_data_request(cur, true);

source/6LoWPAN/Thread/thread_joiner_application.c

@@ -218,6 +218,7 @@ typedef struct {
     int8_t interface_id;
     int8_t coap_service_id;
     int8_t secure_coap_service_id;
+    bool pending_set_in_sync:1;
     ns_list_link_t link;
 } thread_joiner_t;
 
@@ -988,6 +989,7 @@ static int thread_joiner_application_nvm_link_config_read(thread_joiner_t *this)
                 }
                 this->pending_configuration_ptr = pend_conf_ptr;
                 this->pending_configuration_ptr->timeout_in_ms = 0;
+                this->pending_set_in_sync = false;
             }
             else {
                 tr_info("Reading pending from NVM error:%d", pending_ret);
@@ -1201,10 +1203,19 @@ bool thread_joiner_application_pending_config_exists(int8_t interface_id)
     return true;
 }
 
-uint64_t thread_joiner_application_pending_config_timestamp_get(int8_t interface_id)
+bool thread_joiner_application_pending_delay_timer_in_sync(int8_t interface_id)
 {
     thread_joiner_t *this = thread_joiner_find(interface_id);
     if (!this || !this->pending_configuration_ptr) {
+        return false;
+    }
+    return this->pending_set_in_sync;
+}
+
+uint64_t thread_joiner_application_pending_config_timestamp_get(int8_t interface_id)
+{
+    thread_joiner_t *this = thread_joiner_find(interface_id);
+    if (!this || !this->pending_configuration_ptr || !this->pending_set_in_sync) {
         return 0;
     }
     return this->pending_configuration_ptr->timestamp;
@@ -1228,6 +1239,7 @@ int thread_joiner_application_pending_config_enable(int8_t interface_id, uint32_
         return -1;
     }
     this->pending_configuration_ptr->timeout_in_ms = timeout_in_ms;
+    this->pending_set_in_sync = true;
 
     if(this->pending_configuration_ptr->timeout_in_ms > THREAD_MAX_DELAY_TIMER_SECONDS*1000) {
         this->pending_configuration_ptr->timeout_in_ms = THREAD_MAX_DELAY_TIMER_SECONDS*1000;

source/6LoWPAN/Thread/thread_joiner_application.h

@@ -259,7 +259,7 @@ bool thread_joiner_application_next_pending_config_exists(int8_t interface_id);
 uint16_t thread_joiner_application_next_pending_config_length(int8_t interface_id);
 uint8_t *thread_joiner_application_next_pending_config_build(int8_t interface_id, uint8_t *ptr);
 void thread_joiner_application_next_pending_config_delete(int8_t interface_id);
-
+bool thread_joiner_application_pending_delay_timer_in_sync(int8_t interface_id);
 
 
 void thread_joiner_application_next_active_config_save(int8_t interface_id);

source/6LoWPAN/Thread/thread_leader_service.c

@@ -1637,7 +1637,6 @@ int thread_leader_service_thread_partitition_restart(int8_t interface_id, mle_tl
     // Clear network data (if exists) and propagate new empty network data
     thread_network_data_free_and_clean(&cur->thread_info->networkDataStorage);
     thread_network_data_base_init(&cur->thread_info->networkDataStorage);
-    thread_leader_service_network_data_changed(cur, true, true);
     return 0;
 }
 

source/6LoWPAN/Thread/thread_mle_message_handler.c

@@ -42,6 +42,7 @@
 #include "6LoWPAN/Thread/thread_bootstrap.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/Thread/thread_joiner_application.h"
+#include "6LoWPAN/Thread/thread_leader_service.h"
 #include "6LoWPAN/Thread/thread_tmfcop_lib.h"
 #include "6LoWPAN/Thread/thread_host_bootstrap.h"
 #include "6LoWPAN/Thread/thread_router_bootstrap.h"
@@ -594,6 +595,12 @@ static void thread_parse_data_response(protocol_interface_info_entry_t *cur, mle
             tr_debug("SET NWK data Request state");
         }
     }
+
+    // leader has finished synching network data after reset/restart
+    if (cur->thread_info->leader_synced) {
+        cur->thread_info->leader_synced = false;
+        thread_leader_service_network_data_changed(cur, true, true);
+    }
 }
 static int thread_host_child_update_response_send(protocol_interface_info_entry_t *cur, uint8_t *dst_address, mle_tlv_info_t *challengeTlv, mle_tlv_info_t *requestTlv)
 {

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -399,6 +399,11 @@ static void thread_router_synch_receive_cb(int8_t interface_id, mle_message_t *m
                 if (thread_leader_service_thread_partitition_restart(interface_id, &routing)) {
                     return;
                 }
+                thread_network_data_request_send(cur, mle_msg->packet_src_address, false);
+                // force leader to learn active/pending sets from data response
+                cur->thread_info->leader_synced = true;
+                // Prevent the Leader to learn network data from data response
+                cur->thread_info->networkDataRequested = false;
                 tr_info("Router synch OK as Leader");
             } else {
                // Decrement data version and request network data to be updated
@@ -773,13 +778,14 @@ static int mle_build_and_send_data_response_msg(protocol_interface_info_entry_t
 
     length += thread_pending_timestamp_tlv_size(cur);
 
-
     if (!active_timestamp_present_in_request || active_timestamp != link_configuration->timestamp) {
         length += thread_active_operational_dataset_size(cur);
         add_active_configuration = true;
     }
     own_pending_timestamp = thread_joiner_application_pending_config_timestamp_get(cur->id);
-    if (!pending_timestamp_present_in_request || (own_pending_timestamp && own_pending_timestamp != pending_timestamp)) {
+    // if pending config is not in sync from requested device
+    if (!pending_timestamp_present_in_request ||
+            (own_pending_timestamp && own_pending_timestamp != pending_timestamp)) {
         length += thread_pending_operational_dataset_size(cur);
         add_pending_configuration = true;
     }

test/nanostack/unittest/stub/thread_joiner_application_stub.c

@@ -419,4 +419,7 @@ int thread_joiner_application_link_configuration_delete(int8_t interface_id)
 {
     return 0;
 }
-
+bool thread_joiner_application_pending_delay_timer_in_sync(int8_t interface_id)
+{
+    return false;
+}