Review corrections to network data clearing

-review corrections
-Update thread_addr_is_child, now it fails if checking router address

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_border_router_api.c

@@ -297,22 +297,19 @@ static bool thread_border_router_local_network_data_prefix_match(thread_network_
     return true;
 }
 
-static void thread_border_router_children_network_data_check_and_clean(uint8_t interface_id, uint16_t child_id)
+static void thread_border_router_child_network_data_clean(uint8_t interface_id, uint16_t child_id)
 {
     uint8_t addr16_buf[2];
 
-    if (thread_is_router_addr(child_id)) {
-        // Do not check routers
+    common_write_16_bit(child_id, addr16_buf);
+    if (mle_class_get_by_link_address(interface_id, addr16_buf, ADDR_802_15_4_SHORT)) {
+        /* Child is available in mle, do nothing */
         return;
     }
 
-    common_write_16_bit(child_id, addr16_buf);
-
-    if (!mle_class_get_by_link_address(interface_id, addr16_buf, ADDR_802_15_4_SHORT)) {
-        // Child is not our child => network data contains data from lost children, remove it
-        tr_debug("Remove nwk data from lost child: %04x", child_id);
-        thread_management_client_network_data_unregister(interface_id, child_id);
-    }
+    // Child is not our child => network data contains data from lost children, remove it
+    tr_debug("Remove nwk data from lost child: %04x", child_id);
+    thread_management_client_network_data_unregister(interface_id, child_id);
 }
 
 static void thread_border_router_lost_children_nwk_data_validate(protocol_interface_info_entry_t *cur, uint16_t router_short_addr)
@@ -331,15 +328,15 @@ static void thread_border_router_lost_children_nwk_data_validate(protocol_interf
         ns_list_foreach(thread_network_server_data_entry_t, curRoute, &curLP->routeList) {
             if (thread_addr_is_child(router_short_addr, curRoute->routerID)) {
                 // Router children found
-                thread_border_router_children_network_data_check_and_clean(cur->id, curRoute->routerID);
+                thread_border_router_child_network_data_clean(cur->id, curRoute->routerID);
             }
         }
 
         /* Go through all BR's */
         ns_list_foreach(thread_network_server_data_entry_t, curBR, &curLP->borderRouterList) {
             if (thread_addr_is_child(router_short_addr, curBR->routerID)) {
                 // Router children found
-                thread_border_router_children_network_data_check_and_clean(cur->id, curBR->routerID);
+                thread_border_router_child_network_data_clean(cur->id, curBR->routerID);
             }
         }
     }
@@ -349,7 +346,7 @@ static void thread_border_router_lost_children_nwk_data_validate(protocol_interf
         ns_list_foreach(thread_network_data_service_server_entry_t, server, &service->server_list) {
             if (thread_addr_is_child(router_short_addr, server->router_id)) {
                 // Router children found
-                thread_border_router_children_network_data_check_and_clean(cur->id, server->router_id);
+                thread_border_router_child_network_data_clean(cur->id, server->router_id);
             }
         }
     }

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -1194,7 +1194,7 @@ static bool thread_child_id_request(protocol_interface_info_entry_t *cur, mle_ne
         }
 
         //allocate child address if current is router, 0xffff or not our child
-        if (!thread_addr_is_equal_or_child(mac_helper_mac16_address_get(cur), entry_temp->short_adr)) {
+        if (!thread_addr_is_child(mac_helper_mac16_address_get(cur), entry_temp->short_adr)) {
             entry_temp->short_adr = thread_router_bootstrap_child_address_generate(cur);
         }
 

source/6LoWPAN/Thread/thread_routing.h

@@ -163,6 +163,9 @@ THREAD_ROUTING_FN bool thread_is_router_addr(uint16_t addr)
 /* Return true if b is a child of a */
 THREAD_ROUTING_FN bool thread_addr_is_child(uint16_t a, uint16_t b)
 {
+    if (thread_is_router_addr(b)) {
+        return false;
+    }
     return thread_router_addr_from_addr(b) == a;
 }