Revert "Update Thread MLE neighbor list cleanup (#1637)" (#1639)

This reverts commit a20a0ba.

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -1159,14 +1159,14 @@ void thread_bootstrap_ready(protocol_interface_info_entry_t *cur)
     mac_data_poll_protocol_poll_mode_decrement(cur);
 }
 
-void thread_neighbor_list_clean(struct protocol_interface_info_entry *cur)
-{
-    mle_neigh_table_list_t *neig_list = mle_class_active_list_get(cur->id);
-
-    ns_list_foreach_safe(mle_neigh_table_entry_t, cur_entry, neig_list) {
-        if (!thread_addr_is_equal_or_child(cur->thread_info->routerShortAddress, cur_entry->short_adr)) {
-            tr_debug("Free ID %x", cur_entry->short_adr);
-            mle_class_remove_entry(cur->id, cur_entry);
+void thread_clean_all_routers_from_neighbor_list(int8_t interface_id)
+{
+    mle_neigh_table_list_t *neig_list = mle_class_active_list_get(interface_id);
+    /* Init Double linked Routing Table */
+    ns_list_foreach_safe(mle_neigh_table_entry_t, cur, neig_list) {
+        if (thread_is_router_addr(cur->short_adr)) {
+            tr_debug("Free Router %x", cur->short_adr);
+            mle_class_remove_entry(interface_id, cur);
         }
     }
 }

source/6LoWPAN/Thread/thread_bootstrap.h

@@ -106,7 +106,7 @@ void thread_general_mle_receive_cb(int8_t interface_id, mle_message_t *mle_msg,
 int thread_bootstrap_reset_child_info(protocol_interface_info_entry_t *cur, struct mle_neigh_table_entry_t *child);
 void thread_bootstrap_ready(struct protocol_interface_info_entry *cur);
 int thread_bootstrap_reset(struct protocol_interface_info_entry *cur);
-void thread_neighbor_list_clean(struct protocol_interface_info_entry *cur);
+void thread_clean_all_routers_from_neighbor_list(int8_t interface_id);
 bool thread_bootstrap_request_network_data(struct protocol_interface_info_entry *cur, struct thread_leader_data_s *leaderData, uint16_t short_address);
 bool thread_check_is_this_my_parent(struct protocol_interface_info_entry *cur, struct mle_neigh_table_entry_t *entry_temp);
 void thread_clean_old_16_bit_address_based_addresses(struct protocol_interface_info_entry *cur);

source/6LoWPAN/Thread/thread_common.c

@@ -233,8 +233,8 @@ int8_t thread_bootstrap_down(protocol_interface_info_entry_t *cur)
     tr_debug("SET thread Idle");
     //stop polling
     mac_data_poll_disable(cur);
-    //Clean mle table
-    thread_neighbor_list_clean(cur);
+    //Clean routers from mle table
+    thread_clean_all_routers_from_neighbor_list(cur->id);
     // store frame counters
     if (cur->thread_info) {
         thread_nvm_fast_data_t fast_data;
@@ -1848,8 +1848,8 @@ void thread_reset_neighbour_info(protocol_interface_info_entry_t *cur, mle_neigh
     thread_parent_info_t *thread_endnode_parent = thread_info(cur)->thread_endnode_parent;
 
     if (!thread_i_am_router(cur) && thread_endnode_parent && thread_endnode_parent->shortAddress == neighbour->short_adr) {
+        tr_warn("End device lost Parent!\n");
         if(cur->nwk_bootstrap_state != ER_CHILD_ID_REQ) {
-            tr_warn("End device lost parent, reset!\n");
             thread_bootstrap_connection_error(cur->id, CON_PARENT_CONNECT_DOWN, NULL);
         }
     }

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -393,7 +393,7 @@ static void thread_child_synch_receive_cb(int8_t interface_id, mle_message_t *ml
         messageId = mle_tlv_validate_response(mle_msg->data_ptr, mle_msg->data_length);
 
         if (messageId == 0) {
-            tr_debug("No matching challenge");
+            tr_debug("Not for me");
             return;
         }
 
@@ -471,7 +471,7 @@ void thread_mle_parent_discover_receive_cb(int8_t interface_id, mle_message_t *m
         return;
     }
 
-    tr_debug("MLE Parent response handler");
+    tr_debug("Thread MLE Parent request response Handler");
     //State machine What packet should accept in this case
     switch (mle_msg->message_type) {
         case MLE_COMMAND_PARENT_RESPONSE: {
@@ -496,7 +496,7 @@ void thread_mle_parent_discover_receive_cb(int8_t interface_id, mle_message_t *m
             messageId = mle_tlv_validate_response(mle_msg->data_ptr, mle_msg->data_length);
 
             if (messageId == 0) {
-                tr_debug("No matching challenge");
+                tr_debug("Not for me");
                 return;
             }
 
@@ -747,7 +747,7 @@ static void thread_mle_child_request_receive_cb(int8_t interface_id, mle_message
         return;
     }
 
-    tr_debug("Thread MLE Child ID response handler");
+    tr_debug("Thread MLE Child request response Handler");
 
     switch (mle_msg->message_type) {
 
@@ -762,7 +762,7 @@ static void thread_mle_child_request_receive_cb(int8_t interface_id, mle_message
             thread_scanned_parent_t *scan_result = thread_info(cur)->thread_attach_scanned_parent;
             bool new_entry_created;
 
-            tr_info("Recv Child ID Response");
+            tr_info("Received Child ID Response");
 
             // Validate that response is coming from the scanned parent candidate
             memcpy(src_mac64, (mle_msg->packet_src_address + 8), 8);
@@ -779,7 +779,7 @@ static void thread_mle_child_request_receive_cb(int8_t interface_id, mle_message
 
             cur->thread_info->localServerDataBase.release_old_address = true;
 
-            thread_neighbor_list_clean(cur);
+            thread_clean_all_routers_from_neighbor_list(cur->id);
             thread_leader_service_stop(interface_id);
             thread_leader_service_leader_data_free(cur->thread_info);
             thread_merge_prepare(cur);

source/6LoWPAN/Thread/thread_leader_service.c

@@ -1270,7 +1270,7 @@ static int thread_leader_service_leader_init(protocol_interface_info_entry_t *cu
     thread_nd_service_delete(cur->id);
     mpl_clear_realm_scope_seeds(cur);
     ipv6_neighbour_cache_flush(&cur->ipv6_neighbour_cache);
-    thread_neighbor_list_clean(cur);
+    thread_clean_all_routers_from_neighbor_list(cur->id);
     cur->mesh_callbacks = NULL;
     cur->lowpan_info &= ~INTERFACE_NWK_CONF_MAC_RX_OFF_IDLE;
 

source/6LoWPAN/Thread/thread_mle_message_handler.c

@@ -351,12 +351,6 @@ static void thread_parse_advertisement(protocol_interface_info_entry_t *cur, mle
         thread_management_key_synch_req(cur->id, common_read_32_bit(security_headers->Keysource));
     }
 
-    if (entry_temp && !thread_instance_id_matches(cur, &leaderData)) {
-        // Remove MLE entries that are located in other partition
-        mle_class_remove_entry(cur->id, entry_temp);
-        entry_temp = NULL;
-    }
-
     // Check parent status
     if (!thread_attach_active_router(cur)) {
         //processing for non routers
@@ -434,7 +428,7 @@ static void thread_parse_accept(protocol_interface_info_entry_t *cur, mle_messag
     messageId = mle_tlv_validate_response(mle_msg->data_ptr, mle_msg->data_length);
 
     if (messageId == 0) {
-        tr_debug("No matching challenge");
+        tr_debug("Not for me");
         return;
     }
 

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -340,7 +340,7 @@ static void thread_router_synch_receive_cb(int8_t interface_id, mle_message_t *m
             uint16_t messageId = mle_tlv_validate_response(mle_msg->data_ptr, mle_msg->data_length);
 
             if (messageId == 0) {
-                tr_debug("No matching challenge");
+                tr_debug("Not for me");
                 return;
             }
             /*Link accept command has an optional MLE Frame counter TLV, if this is not present use link layer frame counter TLV
@@ -894,7 +894,7 @@ static int thread_attach_parent_response_build(protocol_interface_info_entry_t *
     if (bufId == 0) {
         return -1;
     }
-    tr_debug("Build MLE Parent response");
+    tr_debug("MLE ATTACHED 2. Packet");
 
     uint32_t keySequence;
     uint8_t *ptr = mle_service_get_data_pointer(bufId);
@@ -1357,6 +1357,7 @@ void thread_router_bootstrap_child_id_handler(protocol_interface_info_entry_t *c
         thread_nd_address_registration(cur, tempIPv6Address, entry_temp->short_adr, cur->mac_parameters->pan_id, entry_temp->mac64);
     }
 
+    tr_debug("Response Child Id Request");
     mle_attach_child_id_response_build(cur,ll64,req, entry_temp);
 
     free_request:
@@ -1590,7 +1591,7 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                     uint16_t messageId = mle_tlv_validate_response(mle_msg->data_ptr, mle_msg->data_length);
 
                     if (messageId == 0) {
-                        tr_debug("No matching challenge");
+                        tr_debug("Not for me");
                         return;
                     }
 
@@ -1605,7 +1606,6 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                     mle_msg->packet_src_address[8]  ^= 2;
 
                     if (!id_req) {
-                        tr_debug("No room for child id req");
                         return;
                     }
 
@@ -1627,7 +1627,6 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                             (!mle_tlv_read_32_bit_tlv(MLE_TYPE_LL_FRAME_COUNTER, mle_msg->data_ptr, mle_msg->data_length, &id_req->frameCounter)) ||
                             (!mle_tlv_read_tlv(MLE_TYPE_TLV_REQUEST, mle_msg->data_ptr, mle_msg->data_length, &tlvRequest))) {
                         thread_child_id_request_entry_remove(cur, id_req);
-                        tr_debug("Illegal child id req");
                         return;
                     }
                     //If MLE MLE_TYPE_MLE_FRAME_COUNTER TLV is present then use it for validating further messages else use link layer frame counter
@@ -1828,7 +1827,7 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                 uint16_t messageId = mle_tlv_validate_response(mle_msg->data_ptr, mle_msg->data_length);
 
                 if (messageId == 0) {
-                    tr_debug("No matching challenge");
+                    tr_debug("Not for me");
                     return;
                 }
 

test/nanostack/unittest/stub/thread_bootstrap_stub.c

@@ -257,7 +257,7 @@ int8_t thread_mle_class_init(int8_t interface_id)
     return 0;
 }
 
-void thread_neighbor_list_clean(protocol_interface_info_entry_t *cur)
+void thread_clean_all_routers_from_neighbor_list(int8_t interface_id)
 {
 
 }