Fix compiler warnings and update traces (ARMmbed#1523)

Author: Arto Kinnunen

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -2554,7 +2554,7 @@ void protocol_6lowpan_mac_scan_confirm(int8_t if_id, const mlme_scan_conf_t* con
 
 void bootstrap_timer_handle(uint16_t ticks)
 {
-    ticks;
+    (void)ticks;
     ns_list_foreach(protocol_interface_info_entry_t, cur, &protocol_interface_info_list) {
         if (cur->nwk_id == IF_6LoWPAN) {
             if (cur->nwk_bootstrap_state == ER_ACTIVE_SCAN || cur->nwk_bootstrap_state == ER_WARM_ACTIVE_SCAN) {

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -512,6 +512,7 @@ static int thread_border_relay_to_leader_cb(int8_t service_id, uint8_t source_ad
     return -1;
 }
 
+#ifdef HAVE_THREAD_BORDER_ROUTER
 static bool thread_bbr_i_host_prefix(struct protocol_interface_info_entry *cur, uint8_t prefix_ptr[8], uint8_t *br_count, bool *i_am_lowest)
 {
     bool i_host_this_prefix = false;
@@ -568,6 +569,7 @@ static void thread_bbr_network_data_remove(thread_bbr_t *this)
     memset(this->bbr_prefix,0,8);
     this->br_info_published = false;
 }
+
 static void thread_bbr_network_data_send(thread_bbr_t *this, uint8_t prefix[8], uint8_t eui64[8])
 {
     thread_border_router_info_t br_info = { 0 };
@@ -594,8 +596,8 @@ static void thread_bbr_network_data_send(thread_bbr_t *this, uint8_t prefix[8],
     thread_border_router_prefix_add(this->interface_id, this->bbr_prefix, 64, &br_info);
     thread_border_router_publish(this->interface_id);
     this->br_info_published = true;
-
 }
+
 static void thread_bbr_routing_enable(thread_bbr_t *this)
 {
     if (this->routing_enabled) {
@@ -691,17 +693,18 @@ static void thread_bbr_status_check(thread_bbr_t *this, uint32_t seconds)
             } else {
                 this->br_delete_timer = randLIB_get_random_in_range(5,10);
             }
-            tr_info("br: too many BRs start remove jitter: %d", this->br_delete_timer);
+            tr_info("br: too many BRs start remove jitter:%"PRIu32, this->br_delete_timer);
             return;
         }
         if (this->br_info_published && !bbr_prefix_ptr ) {
             // Need to disable ND proxy will give a 20 second delay for it We could also disable routing immediately
             this->br_delete_timer = 20;
-            tr_info("br: can not be border router need to remove after: %d", this->br_delete_timer);
+            tr_info("br: can not be border router need to remove after: %"PRIu32, this->br_delete_timer);
             return;
         }
     }
 }
+
 static bool thread_bbr_activated(thread_bbr_t *this, uint32_t seconds)
 {
     protocol_interface_info_entry_t *cur;
@@ -740,7 +743,6 @@ static bool thread_bbr_activated(thread_bbr_t *this, uint32_t seconds)
     return false;
 }
 
-#ifdef HAVE_THREAD_BORDER_ROUTER
 bool thread_bbr_routing_enabled(protocol_interface_info_entry_t *cur)
 {
     thread_bbr_t *this = thread_bbr_find_by_interface(cur->thread_info->interface_id);
@@ -756,7 +758,7 @@ void thread_bbr_network_data_update_notify(protocol_interface_info_entry_t *cur)
     (void) cur;
     thread_mdns_network_data_update_notify();
 }
-#endif
+#endif /* HAVE_THREAD_BORDER_ROUTER*/
 
 static void thread_bbr_udp_proxy_service_stop(int8_t interface_id)
 {

source/6LoWPAN/Thread/thread_border_router_api.c

@@ -314,8 +314,6 @@ static void thread_border_router_child_network_data_clean(uint8_t interface_id,
 
 static void thread_border_router_lost_children_nwk_data_validate(protocol_interface_info_entry_t *cur, uint16_t router_short_addr)
 {
-
-    tr_debug("thread_border_router_lost_children_nwk_data_validate() %x", router_short_addr);
     if (!thread_is_router_addr(router_short_addr)) {
         // not validating children nwk data
         return;
@@ -432,6 +430,7 @@ static bool thread_border_router_local_srv_data_in_network_data_check(protocol_i
     return true;
 }
 
+#ifdef HAVE_THREAD_BORDER_ROUTER
 static int thread_border_router_recursive_dns_server_option_store(int8_t interface_id, uint8_t *recursive_dns_server_option, uint16_t recursive_dns_server_option_len)
 {
     thread_border_router_t *this = thread_border_router_find_by_interface(interface_id);
@@ -451,7 +450,9 @@ static int thread_border_router_recursive_dns_server_option_store(int8_t interfa
     }
     return 0;
 }
+#endif
 
+#ifdef HAVE_THREAD_BORDER_ROUTER
 static int thread_border_router_dns_search_list_option_store(int8_t interface_id, uint8_t *dns_search_list_option, uint16_t search_list_option_len)
 {
     thread_border_router_t *this = thread_border_router_find_by_interface(interface_id);
@@ -470,6 +471,7 @@ static int thread_border_router_dns_search_list_option_store(int8_t interface_id
     }
     return 0;
 }
+#endif
 
 int8_t thread_border_router_init(int8_t interface_id)
 {

source/6LoWPAN/Thread/thread_network_data_storage.c

@@ -2451,7 +2451,7 @@ uint8_t *thread_network_data_service_set_write(thread_network_data_cache_entry_t
         tlvLength = thread_nd_service_based_on_list_entry_size(cur, true);
         if (tlvLength) {
             ptr = thread_nd_service_header_write(ptr, cur, tlvLength);
-            tr_debug("Service: sid:%d e:%d data:%s",cur->S_id, cur->S_enterprise_number, trace_array(cur->S_service_data, cur->S_service_data_length));
+            tr_debug("Service: sid:%d e:%"PRIu32" data:%s",cur->S_id, cur->S_enterprise_number, trace_array(cur->S_service_data, cur->S_service_data_length));
             ptr = thread_nd_service_server_list_write(&cur->server_list, ptr, true);
         }
     }

source/6LoWPAN/Thread/thread_nvm_store.c

@@ -144,7 +144,7 @@ int thread_nvm_store_device_configuration_read(uint8_t *mac_ptr, uint8_t *mleid_
     ret = thread_nvm_store_read(device_conf_path, &d_c, sizeof(thread_nvm_device_conf_t), &version);
     if(THREAD_NVM_FILE_SUCCESS==ret) {
         if (THREAD_NVM_FILE_SUCCESS==ret && DEVICE_CONF_VERSION!=version) {
-            tr_info("fast data version mismatch %d", version);
+            tr_info("fast data version mismatch %"PRIu32, version);
             ret = THREAD_NVM_FILE_VERSION_WRONG;
         }
         else {
@@ -182,7 +182,7 @@ int thread_nvm_store_pending_configuration_read(void *data, uint16_t size)
 
     int ret = thread_nvm_store_read(pc_data_path, data, size, &version);
     if (THREAD_NVM_FILE_SUCCESS==ret && PENDING_CONF_DATA_VERSION!=version) {
-        tr_info("Pending configuration version mismatch %d", version);
+        tr_info("Pending configuration version mismatch %"PRIu32, version);
         return THREAD_NVM_FILE_VERSION_WRONG;
     }
     return ret;
@@ -216,7 +216,7 @@ int thread_nvm_store_active_configuration_read(void *data, uint16_t data_size)
 
     int ret = thread_nvm_store_read(ac_data_path, data, data_size, &version);
     if (THREAD_NVM_FILE_SUCCESS==ret && ACTIVE_CONF_DATA_VERSION!=version) {
-        tr_info("active configuration version mismatch %d", version);
+        tr_info("active configuration version mismatch %"PRIu32, version);
         return THREAD_NVM_FILE_VERSION_WRONG;
     }
     return ret;
@@ -324,7 +324,7 @@ int thread_nvm_store_fast_data_read(thread_nvm_fast_data_t* fast_data)
         uint32_t version;
         ret = thread_nvm_store_read(fast_data_path, fast_data, sizeof(thread_nvm_fast_data_t), &version);
         if (THREAD_NVM_FILE_SUCCESS==ret && FAST_DATA_VERSION!=version) {
-            tr_info("fast data version mismatch %d", version);
+            tr_info("fast data version mismatch %"PRIu32, version);
             return THREAD_NVM_FILE_VERSION_WRONG;
         }
     }
@@ -347,12 +347,13 @@ static int thread_nvm_store_write(const char *file_name, void *data, uint32_t da
 {
     FILE *fp = fopen(file_name, "w");
     if(fp == NULL) {
+        tr_error("NVM open error: %s", file_name);
         return THREAD_NVM_FILE_CANNOT_OPEN;
     }
 
     size_t n_bytes = fwrite(&version, 1, sizeof(uint32_t), fp);
     if (n_bytes!=sizeof(uint32_t)) {
-        tr_warning("NVM version write failed");
+        tr_warning("NVM version write error");
         fclose(fp);
         return THREAD_NVM_FILE_WRITE_ERROR;
     }
@@ -373,13 +374,13 @@ static int thread_nvm_store_read(const char *file_name, void *data, uint32_t dat
 {
     FILE *fp = fopen(file_name, "r");
     if(fp == NULL) {
-        tr_warning("File not found %s", file_name);
+        tr_warning("File not found: %s", file_name);
         return THREAD_NVM_FILE_CANNOT_OPEN;
     }
 
     size_t n_bytes = fread(version, 1, sizeof(uint32_t), fp);
     if (n_bytes!=sizeof(uint32_t)) {
-        tr_warning("NVM version read failed %s", file_name);
+        tr_warning("NVM version read error %s", file_name);
         fclose(fp);
         return THREAD_NVM_FILE_READ_ERROR;
     }
@@ -418,14 +419,14 @@ int thread_nvm_store_link_info_read(void)
     if (status != THREAD_NVM_FILE_SUCCESS) {
         if (!memcmp(cached_link_info.nvm_link_info.mac, ADDR_UNSPECIFIED, 8) &&
             cached_link_info.nvm_link_info.short_addr == LINK_INFO_SHORT_ADDR_NOT_SET) {
-            tr_info("link info not cached and read failed");
+            tr_info("link info not cached and read error %d", status);
             cached_link_info.loaded = false;
             return THREAD_NVM_FILE_READ_ERROR;
         }
         return status;
     }
     else if (ACTIVE_CONF_DATA_VERSION != version) {
-        tr_info("link info version mismatch %d", version);
+        tr_info("link info version mismatch %"PRIu32, version);
         return THREAD_NVM_FILE_VERSION_WRONG;
     }
     memcpy(cached_link_info.nvm_link_info.mac, nvm_link_info_tmp.mac, 8);

source/Common_Protocols/ipv6.c

@@ -1075,9 +1075,6 @@ static buffer_t *ipv6_consider_forwarding_multicast_packet(buffer_t *buf, protoc
         cur->if_special_multicast_forwarding(cur, buf);
     }
 
-    uint_fast8_t group_scope = addr_ipv6_multicast_scope(buf->dst_sa.address);
-    uint_fast8_t src_scope = addr_ipv6_scope(buf->src_sa.address, cur);
-
 #ifdef HAVE_MPL
     /* MPL does its own thing - we do not perform any "native" forwarding */
     if (buf->options.ip_extflags & IPEXT_HBH_MPL) {
@@ -1086,6 +1083,9 @@ static buffer_t *ipv6_consider_forwarding_multicast_packet(buffer_t *buf, protoc
 #endif
 
 #ifdef MULTICAST_FORWARDING
+    uint_fast8_t group_scope = addr_ipv6_multicast_scope(buf->dst_sa.address);
+    uint_fast8_t src_scope = addr_ipv6_scope(buf->src_sa.address, cur);
+
     /* Look at reverse path - check our route to the source address */
     ipv6_route_t *route = ipv6_route_choose_next_hop(buf->src_sa.address, cur->id, NULL);
 

source/MPL/mpl.c

@@ -1128,9 +1128,6 @@ static buffer_t *mpl_exthdr_provider(buffer_t *buf, ipv6_exthdr_stage_t stage, i
                 buf->options.ip_extflags &=~ IPEXT_HBH_MPL_UNFILLED;
                 buf->mpl_option_data_offset = IPV6_HDRLEN + 4;
                 mpl_forwarder_process_message(buf, domain, true);
-            } else {
-                uint8_t *iphdr = buffer_data_pointer(buf);
-                uint8_t *ext = iphdr + IPV6_HDRLEN;
             }
             *result = 0;
             return buf;

source/RPL/rpl_data.c

@@ -51,6 +51,7 @@
 
 #define RPL_DATA_SR_INIT_SIZE (16*4)
 
+#ifdef HAVE_RPL_ROOT
 typedef struct rpl_data_sr {
     rpl_dao_target_t *target;   /* Target - note may be a prefix */
     uint16_t iaddr_size;
@@ -60,6 +61,7 @@ typedef struct rpl_data_sr {
 } rpl_data_sr_t;
 
 static rpl_data_sr_t *rpl_data_sr;
+#endif
 
 static const uint8_t *rpl_data_get_dodagid(const buffer_t *buf);
 

source/RPL/rpl_downward.c

@@ -170,19 +170,6 @@ void rpl_downward_convert_dodag_preferences_to_dao_path_control(rpl_dodag_t *dod
     }
 }
 
-static uint_fast8_t rpl_downward_path_control_to_preference(uint8_t pc)
-{
-    if (pc >= 0x40) {
-        return 1;
-    } else if (pc >= 0x10) {
-        return 2;
-    } else if (pc >= 0x04) {
-        return 3;
-    } else {
-        return 4;
-    }
-}
-
 static void rpl_downward_target_refresh(rpl_dao_target_t *target)
 {
     target->need_seq_inc = true;
@@ -826,6 +813,19 @@ void rpl_instance_send_dao_no_path(rpl_instance_t *instance, rpl_dao_target_t *t
 #endif
 
 #ifdef HAVE_RPL_ROOT
+static uint_fast8_t rpl_downward_path_control_to_preference(uint8_t pc)
+{
+    if (pc >= 0x40) {
+        return 1;
+    } else if (pc >= 0x10) {
+        return 2;
+    } else if (pc >= 0x04) {
+        return 3;
+    } else {
+        return 4;
+    }
+}
+
 static rpl_dao_root_transit_t *rpl_downward_add_root_transit(rpl_dao_target_t *target, const uint8_t parent[16], uint8_t path_control)
 {
     //rpl_dao_root_transit_t *old_first = ns_list_get_first(&target->info.root.transits);

source/Security/PANA/eap_protocol.c

@@ -272,10 +272,10 @@ buffer_t *eap_down(buffer_t *buf, sec_suite_t *suite)
 
 buffer_t *eap_up(buffer_t *buf, sec_suite_t *suite)
 {
+    eap_header_t header;
     uint8_t *ptr = buffer_data_pointer(buf);
     uint16_t payload_length = buffer_data_length(buf);
-    eap_header_t header;
-    uint8_t response_counter;
+    uint8_t response_counter = suite->retry_counter;
     if (!eap_header_parse(ptr, payload_length, &header)) {
         return buffer_free(buf);
     }
@@ -288,7 +288,6 @@ buffer_t *eap_up(buffer_t *buf, sec_suite_t *suite)
         }
         //tr_debug("EAP RES");
         suite->pana_session.eap_id_seq++;
-        response_counter = suite->retry_counter;
         suite->retry_counter = 0;
     } else if (header.eap_code == EAP_REQ) {
 

source/libNET/src/net_load_balance.c

@@ -263,22 +263,25 @@ void net_load_balance_internal_state_activate(protocol_interface_info_entry_t *i
 
 }
 
-
+#ifdef HAVE_RPL
+#ifdef HAVE_6LOWPAN_BORDER_ROUTER
 static int8_t net_load_balance_api_get_node_count_cb(void *lb_user, uint16_t *node_count)
 {
-#ifdef HAVE_RPL
     protocol_interface_info_entry_t *interface_ptr = lb_user;
     if (rpl_control_get_instance_dao_target_count(interface_ptr->rpl_domain, 1, NULL, node_count) ) {
         return 0;
     }
-#endif
+
     return -1;
 }
+#endif
+#endif
 
+#ifdef HAVE_RPL
+#ifdef HAVE_6LOWPAN_BORDER_ROUTER
 static int8_t net_load_balance_api_get_set_load_level_cb(void *lb_user, uint8_t load_level)
 {
     //Call DODAG preference
-#ifdef HAVE_RPL
     protocol_interface_info_entry_t *interface_ptr = lb_user;
     if (!interface_ptr->rpl_domain || interface_ptr->rpl_domain != protocol_6lowpan_rpl_domain || !protocol_6lowpan_rpl_root_dodag) {
         return -1;
@@ -290,12 +293,9 @@ static int8_t net_load_balance_api_get_set_load_level_cb(void *lb_user, uint8_t
 
     rpl_control_set_dodag_pref(protocol_6lowpan_rpl_root_dodag, RPL_DODAG_PREF_MASK - load_level);
     return 0;
-
-#else
-    return -1;
-#endif
 }
-
+#endif
+#endif
 
 int8_t net_load_balance_load_level_update_enable(int8_t interface_id, uint16_t expected_device_count)
 {