purge old partition data when child id response is received (ARMmbed#1588)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -121,12 +121,10 @@ static void thread_merge_prepare(protocol_interface_info_entry_t *cur)
 {
     thread_clean_old_16_bit_address_based_addresses(cur);
     mpl_clear_realm_scope_seeds(cur);
-    ipv6_neighbour_cache_flush(&cur->ipv6_neighbour_cache);
     ipv6_route_table_remove_info(cur->id, ROUTE_THREAD_PROXIED_HOST, NULL);
-    thread_routing_deactivate(&cur->thread_info->routing);
-    thread_routing_init(&cur->thread_info->routing);
-    cur->nwk_mode = ARM_NWK_GP_IP_MODE;
+    thread_old_partition_data_purge(cur);
     thread_network_data_clean(cur);
+    cur->nwk_mode = ARM_NWK_GP_IP_MODE;
 }
 
 //This function is for Thread Parent scan callback
@@ -1139,6 +1137,7 @@ int8_t thread_host_bootstrap_child_update(int8_t interface_id, const uint8_t *ma
     uint8_t mode;
     uint32_t keySequence;
 
+
     if (!cur->thread_info->thread_endnode_parent) {
         return -1;
     }
@@ -1199,6 +1198,7 @@ int8_t thread_host_bootstrap_child_update(int8_t interface_id, const uint8_t *ma
     mle_service_set_packet_callback(bufId, thread_child_update_timeout_cb);
     mle_service_set_msg_timeout_parameters(bufId, &timeout);
     mle_service_send_message(bufId);
+
     return 0;
 }
 int thread_host_bootstrap_child_update_negative_response(protocol_interface_info_entry_t *cur, uint8_t *dstAddress, mle_tlv_info_t *challenge)

source/6LoWPAN/Thread/thread_routing.c

@@ -879,14 +879,14 @@ void thread_routing_init(thread_routing_info_t *routing)
 {
     ns_list_init(&routing->route_set);
     ns_list_init(&routing->link_set);
-    routing->networkIdTimeout = NETWORK_ID_TIMEOUT;
     thread_routing_reset(routing);
 }
 
 void thread_routing_reset(thread_routing_info_t *routing)
 {
     thread_routing_free(routing);
     routing->router_id_sequence_valid = false;
+    routing->networkIdTimeout = NETWORK_ID_TIMEOUT;
     memset(routing->fast_route_table, FAST_ROUTE_INVALID_ID, sizeof routing->fast_route_table);
     trickle_start(&routing->mle_advert_timer, &thread_mle_advert_trickle_params);
 }