Thread router network data update after link sync (ARMmbed#1530)

-Router is removing its own network data after link sync by sending
 a/sd to the leader. According to the spec own data should not be
 cleared after link sync.

-Remove excess traces from thread_bbr.

-Fix coverity CID 223399 (Unchecked return value from library) from
 thread_joiner_application.

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -768,7 +768,6 @@ static void thread_bbr_udp_proxy_service_stop(int8_t interface_id)
         tr_error("Failed to find BA instance");
         return;
     }
-    tr_debug("thread_border_router_udp_proxy_service_stop %d", interface_id);
 
     socket_close(this->udp_proxy_socket);
     this->udp_proxy_socket = -1;
@@ -789,19 +788,18 @@ int thread_bbr_commissioner_proxy_service_update(int8_t interface_id)
         goto return_fail;
     }
 
-    if (cur->thread_info->registered_commissioner.commissioner_valid) {
-        // relay is needed
+    if (!cur->thread_info->registered_commissioner.commissioner_valid) {
+        // commissioner not enabled
         if (this->udp_proxy_socket != -1) {
-            // UDP service is already running
-            return 0;
+            thread_bbr_udp_proxy_service_stop(interface_id);
         }
-    } else if (this->udp_proxy_socket != -1) {
-        // UDP service is running and need to delete
-        thread_bbr_udp_proxy_service_stop(interface_id);
         return 0;
     }
-    tr_debug("thread_border_router_udp_proxy_service_start %d", interface_id);
 
+    if (this->udp_proxy_socket != -1) {
+        // commissioner is valid and UDP service is already running
+        return 0;
+    }
 
     // Set source parameters, if commissioner is available
     ret_val = thread_management_get_commissioner_address(this->interface_id, &ns_source_addr.address[0], 0);

source/6LoWPAN/Thread/thread_joiner_application.c

@@ -1134,7 +1134,7 @@ void thread_joiner_pending_config_activate(int8_t interface_id)
     this->active_configuration_ptr->timestamp = pending_active_timestamp;
     // All information is copied from old configuration so if configuration is corrupt we dont change anything.
     this->pending_configuration_ptr = NULL;
-    thread_nvm_store_pending_configuration_remove();
+    (void)thread_nvm_store_pending_configuration_remove();
     configuration_set_copy_mandatory(this->active_configuration_ptr, this->old_active_configuration_ptr);
     link_configuration_update(this->configuration_ptr,this->active_configuration_ptr->data, this->active_configuration_ptr->length);
     link_configuration_trace(this->configuration_ptr);

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -399,21 +399,17 @@ static void thread_router_synch_receive_cb(int8_t interface_id, mle_message_t *m
                 if (thread_leader_service_thread_partitition_restart(interface_id, &routing)) {
                     return;
                 }
-                tr_info("Router synch success as Leader of network");
+                tr_info("Router synch OK as Leader");
             } else {
-               // Remove possibly registered network data from leader
-               thread_management_client_network_data_unregister(cur->id, address16);
-
                // Decrement data version and request network data to be updated
                cur->thread_info->thread_leader_data->dataVersion--;
                cur->thread_info->thread_leader_data->stableDataVersion--;
                thread_network_data_request_send(cur, mle_msg->packet_src_address, true);
-               tr_info("Router synch success as Router");
+               tr_info("Router synch OK as Router");
             }
 
             thread_router_bootstrap_route_tlv_push(cur, routing.dataPtr, routing.tlvLen , linkMargin, entry_temp);
             thread_bootstrap_attached_ready(cur);
-
         }
 
         break;