Thread Child ml16 update clear old address queue's and registered address.

Change-Id: I7a735c941467de51997e7881d4f6c830fc7ac9b4

Author: Juha Heiskanen

source/6LoWPAN/Thread/thread_mle_message_handler.c

@@ -285,7 +285,7 @@ static void thread_update_mle_entry(protocol_interface_info_entry_t *cur, mle_me
     if (short_address != entry_temp->mac16) {
         if (thread_router_addr_from_addr(entry_temp->mac16) == cur->thread_info->routerShortAddress) {
             thread_dynamic_storage_child_info_clear(cur->id, entry_temp);
-            protocol_6lowpan_release_short_link_address_from_neighcache(cur, entry_temp->mac16);
+
         }
         entry_temp->mac16 = short_address;
         /* throw MLME_GET request, short address is changed automatically in get request callback */

source/6LoWPAN/Thread/thread_network_synch.c

@@ -64,6 +64,7 @@
 #include "Common_Protocols/icmpv6_radv.h"
 #include "MLE/mle.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
+#include "6LoWPAN/lowpan_adaptation_interface.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 
 #define TRACE_GROUP "tsyn"
@@ -192,15 +193,29 @@ void thread_dynamic_storage_child_info_store(protocol_interface_info_entry_t *cu
 
 void thread_dynamic_storage_child_info_clear(int8_t interface_id, struct mac_neighbor_table_entry *child)
 {
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
+    if (!cur) {
+        return;
+    }
     thread_sync_child_info_t *child_info = thread_dynamic_storage_child_info_find(interface_id, child);
 
+
     if (child_info) {
         // Clear child information
         memset(child_info, 0, sizeof(thread_sync_child_info_t));
         tr_debug("Dynamic storage: cleared child; mac16=%04x", child->mac16);
-        return;
     }
-    return;
+    uint8_t temp_address[2];
+    common_write_16_bit(child->mac16, temp_address);
+    //Release Old short address entries
+    lowpan_adaptation_free_messages_from_queues_by_address(cur, temp_address, ADDR_802_15_4_SHORT);
+    /* As we are losing a link to a child address, we can assume that if we have an IP neighbour cache
+     * mapping to that address, it is no longer valid. We must have been their parent, and they must be
+     * finding a new parent, and hence a new 16-bit address. (Losing a link to a router address would not
+     * invalidate our IP->16-bit mapping.)
+     */
+    protocol_6lowpan_release_short_link_address_from_neighcache(cur, child->mac16);
+
 }
 
 static thread_sync_child_info_t *thread_dynamic_storage_child_info_find(int8_t interface_id, mac_neighbor_table_entry_t *child)

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -969,13 +969,6 @@ int thread_router_bootstrap_reset_child_info(protocol_interface_info_entry_t *cu
     tr_debug("Child free %x", child->mac16);
     thread_dynamic_storage_child_info_clear(cur->id, child);
 
-    /* As we are losing a link to a child address, we can assume that if we have an IP neighbour cache
-     * mapping to that address, it is no longer valid. We must have been their parent, and they must be
-     * finding a new parent, and hence a new 16-bit address. (Losing a link to a router address would not
-     * invalidate our IP->16-bit mapping.)
-     */
-    protocol_6lowpan_release_short_link_address_from_neighcache(cur, child->mac16);
-
     // If Child's RLOC16 appears in the Network Data send the RLOC16 to the Leader
     if (thread_network_data_services_registered(&cur->thread_info->networkDataStorage, child->mac16)) {
         tr_debug("Remove references to Child's RLOC16 from the Network Data");
@@ -1824,7 +1817,6 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                 // Was this previously our child? If yes, update.
                 if ((entry_temp->mac16 & THREAD_CHILD_MASK) && thread_router_addr_from_addr(entry_temp->mac16) == cur->thread_info->routerShortAddress) {
                     thread_dynamic_storage_child_info_clear(cur->id, entry_temp);
-                    protocol_6lowpan_release_short_link_address_from_neighcache(cur, entry_temp->mac16);
                 }
                 update_mac_mib = true;
                 entry_temp->mac16 = shortAddress; // short address refreshed

test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c

@@ -1372,7 +1372,7 @@ bool test_lowpan_adaptation_interface_mpx_register()
 
 
     if (0 != lowpan_adaptation_free_messages_from_queues_by_address(&entry, test_buf2->dst_sa.address,
-                                                                             test_buf2->dst_sa.addr_type)) {
+                                                                    test_buf2->dst_sa.addr_type)) {
         lowpan_adaptation_interface_free(0);
         free(test_buf);
         free(test_buf2);