Merge pull request ARMmbed#1623 from ARMmbed/mergeMtoK3

Merge mto k3

Author: Jarkko Paso

nanostack/net_interface.h

@@ -996,6 +996,7 @@ extern void net_get_version_information(uint8_t *ptr);
  *
  * Note! In Thread mode parent buffer size is automatically set during Thread initialization.
  *
+ * \param interface_id Network interface ID.
  * \param big_packet_threshold Indicate how long packets are considered big. For Thread, must be 106 bytes.
  * \param small_packets_per_child_count Number of small packets stored for each sleepy children. For Thread, must be at least 1.
  * \param big_packets_total_count Total number of big packets parent can store for all sleepy children. For Thread, must be at least 1.

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -1668,6 +1668,23 @@ bool thread_network_data_timeout(int8_t interface_id, uint16_t msgId, bool usedA
         return true;
     }
 
+    if(cur->thread_info->leader_synced) {
+        if(usedAllRetries) {
+            // could not learn network data from neighbour, everyone must reregister
+            cur->thread_info->leader_synced = false;
+            thread_leader_service_network_data_changed(cur,true,true);
+            return false;
+        } else {
+            tr_debug("retrying as leader data not yet synced");
+            return true;
+        }
+    }
+
+    // if REED fails to get updated network data, it reattaches
+    if (thread_info(cur)->networkDataRequested && !thread_attach_active_router(cur) && usedAllRetries) {
+        thread_bootstrap_reset_restart(interface_id);
+    }
+
     thread_info(cur)->networkDataRequested = false;
     mac_data_poll_protocol_poll_mode_decrement(cur);
     return false;

test/nanostack/unittest/stub/thread_leader_service_stub.c

@@ -80,3 +80,6 @@ uint16_t thread_leader_service_child_id_from_networkdata_get(struct thread_info_
 void thread_leader_service_thread_partitition_generate(int8_t interface_id, bool newPartition)
 {
 }
+void thread_leader_service_network_data_changed(protocol_interface_info_entry_t *cur, bool force_stable_update, bool force_unstable_update)
+{
+}