added active and pending timestamps to child update response (ARMmbed#1533)

if network data is requested.
Active and pending operational datasets are also added
if the timestamps do not match.

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -100,7 +100,7 @@ static void thread_bootstrap_client_router_id_release_cb(int8_t interface_id, in
 static int thread_router_synch_accept_request_build(protocol_interface_info_entry_t *cur, mle_message_t *mle_msg, uint16_t shortAddress, uint8_t *challenge, uint8_t chalLen, uint8_t *tlvReq, uint8_t tlvReqLen);
 static int thread_router_accept_to_endevice(protocol_interface_info_entry_t *cur, mle_message_t *mle_msg, uint8_t *challenge, uint8_t chalLen);
 static int thread_router_accept_request_build(protocol_interface_info_entry_t *cur, mle_message_t *mle_msg, uint16_t shortAddress, uint8_t *challenge, uint8_t chalLen, uint8_t type, bool rssi_tlv, uint8_t rssi);
-static int thread_child_update_response(protocol_interface_info_entry_t *cur, uint8_t *dst_address, uint8_t mode, uint16_t short_address, uint32_t timeout, mle_tlv_info_t *addressRegisterTlv,mle_tlv_info_t *tlvReq, mle_tlv_info_t *challengeTlv);
+static int thread_child_update_response(protocol_interface_info_entry_t *cur, uint8_t *dst_address, uint8_t mode, uint16_t short_address, uint32_t timeout, mle_tlv_info_t *addressRegisterTlv,mle_tlv_info_t *tlvReq, mle_tlv_info_t *challengeTlv, uint64_t active_timestamp, uint64_t pending_timestamp);
 static int mle_build_and_send_data_response_msg(protocol_interface_info_entry_t *cur, uint8_t *dst_address, uint8_t *data_ptr, uint16_t data_len, mle_tlv_info_t *request_tlv, uint8_t mode);
 static int thread_attach_parent_response_build(protocol_interface_info_entry_t *cur, uint8_t *dstAddress, uint8_t *challenge, uint16_t chalLen, uint8_t linkMargin, uint8_t scanMask, uint8_t mode);
 static int mle_attach_child_id_response_build(protocol_interface_info_entry_t *cur, uint8_t *dstAddress,thread_pending_child_id_req_t *child_req,mle_neigh_table_entry_t *neigh_info);
@@ -681,16 +681,39 @@ static uint8_t *thread_tlv_add(protocol_interface_info_entry_t *cur, uint8_t *pt
     return ptr;
 }
 
-static int thread_child_update_response(protocol_interface_info_entry_t *cur, uint8_t *dst_address, uint8_t mode, uint16_t short_address, uint32_t timeout, mle_tlv_info_t *addressRegisterTlv,mle_tlv_info_t *tlvReq, mle_tlv_info_t *challengeTlv)
+static int thread_child_update_response(protocol_interface_info_entry_t *cur, uint8_t *dst_address, uint8_t mode, uint16_t short_address, uint32_t timeout, mle_tlv_info_t *addressRegisterTlv,mle_tlv_info_t *tlvReq, mle_tlv_info_t *challengeTlv, uint64_t active_timestamp, uint64_t pending_timestamp)
 {
     uint16_t i;
     uint16_t len = 64;
     uint32_t keySequence;
+    bool add_active_configuration = false;
+    bool add_pending_configuration = false;
+    uint64_t own_pending_timestamp = 0;
     uint8_t *ptr;
     if (!thread_info(cur)) {
         return -1;
     }
+    link_configuration_s *link_configuration;
+    link_configuration = thread_joiner_application_get_config(cur->id);
+
+    if (!link_configuration) {
+        return -1;
+    }
 
+    len += 10; // active timestamp tlv size
+    len += thread_pending_timestamp_tlv_size(cur);
+
+    if (!active_timestamp || active_timestamp != link_configuration->timestamp) {
+        len += thread_active_operational_dataset_size(cur);
+        add_active_configuration = true;
+    }
+    own_pending_timestamp = thread_joiner_application_pending_config_timestamp_get(cur->id);
+    // if pending config is not in sync from requested device
+    if (!pending_timestamp ||
+            (own_pending_timestamp && own_pending_timestamp != pending_timestamp)) {
+        len += thread_pending_operational_dataset_size(cur);
+        add_pending_configuration = true;
+    }
     if (tlvReq && tlvReq->tlvLen) {
         mle_tlv_ignore(tlvReq->dataPtr, tlvReq->tlvLen, MLE_TYPE_LL_FRAME_COUNTER);
         len += thread_tlv_len(cur, tlvReq->dataPtr, tlvReq->tlvLen, mode);
@@ -743,6 +766,16 @@ static int thread_child_update_response(protocol_interface_info_entry_t *cur, ui
         if (mle_tlv_requested(tlvReq->dataPtr, tlvReq->tlvLen, MLE_TYPE_ADDRESS16)) {
             ptr = mle_tlv_write_short_address(ptr, short_address);
         }
+        if (mle_tlv_requested(tlvReq->dataPtr, tlvReq->tlvLen, MLE_TYPE_NETWORK_DATA)) {
+            ptr = thread_active_timestamp_write(cur,ptr);
+            ptr = thread_pending_timestamp_write(cur,ptr);
+            if (add_active_configuration) {
+                ptr = thread_active_operational_dataset_write(cur, ptr);
+            }
+            if (add_pending_configuration) {
+                ptr = thread_pending_operational_dataset_write(cur, ptr);
+            }
+        }
     }
 
     if (mle_service_update_length_by_ptr(bufId,ptr)!= 0) {
@@ -1826,6 +1859,8 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                     uint8_t mode;
                     uint8_t status;
                     uint32_t timeout = 0;
+                    uint64_t active_timestamp = 0;
+                    uint64_t pending_timestamp = 0;
                     mle_tlv_info_t addressRegisterTlv = {0};
                     mle_tlv_info_t challengeTlv = {0};
                     mle_tlv_info_t tlv_req = {0};
@@ -1859,6 +1894,8 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
 
                     addressRegisterTlv.tlvType = MLE_TYPE_UNASSIGNED;
                     mle_tlv_read_tlv(MLE_TYPE_ADDRESS_REGISTRATION, mle_msg->data_ptr, mle_msg->data_length, &addressRegisterTlv);
+                    mle_tlv_read_64_bit_tlv(MLE_TYPE_ACTIVE_TIMESTAMP, mle_msg->data_ptr, mle_msg->data_length, &active_timestamp);
+                    mle_tlv_read_64_bit_tlv(MLE_TYPE_PENDING_TIMESTAMP, mle_msg->data_ptr, mle_msg->data_length, &pending_timestamp);
 
                     mle_tlv_read_tlv(MLE_TYPE_TLV_REQUEST, mle_msg->data_ptr, mle_msg->data_length, &tlv_req);
 
@@ -1881,7 +1918,7 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
 
                     tr_debug("Keep-Alive -->Respond Child");
                     //Response
-                    thread_child_update_response(cur, mle_msg->packet_src_address, mode, entry_temp->short_adr, timeout, &addressRegisterTlv, &tlv_req, &challengeTlv);
+                    thread_child_update_response(cur, mle_msg->packet_src_address, mode, entry_temp->short_adr, timeout, &addressRegisterTlv, &tlv_req, &challengeTlv, active_timestamp, pending_timestamp);
 
                 }
                 break;