Corrected compilation warnings from tracing and UT stubs

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_controller.c

@@ -753,7 +753,7 @@ int8_t ws_pae_controller_gtk_update(int8_t interface_id, uint8_t *gtk[4])
             uint32_t lifetime = sec_prot_keys_gtk_install_order_last_lifetime_get(&controller->gtks);
             lifetime += controller->timer_settings.gtk_expire_offset;
             if (sec_prot_keys_gtk_set(&controller->gtks, i, gtk[i], lifetime) >= 0) {
-                tr_info("GTK set index: %i, lifetime %i, system time: %i", i, lifetime, protocol_core_monotonic_time / 10);
+                tr_info("GTK set index: %i, lifetime %"PRIx32", system time: %"PRIx32"", i, lifetime, protocol_core_monotonic_time / 10);
             }
         }
     }

source/6LoWPAN/ws/ws_pae_controller.h

@@ -427,7 +427,6 @@ void ws_pae_controller_slow_timer(uint16_t seconds);
 #define ws_pae_controller_stop(interface_ptr)
 #define ws_pae_controller_delete(interface_ptr)
 #define ws_pae_controller_cb_register(interface_ptr, completed, nw_key_insert, nw_send_key_index_set, pan_ver_increment) 1
-#define ws_pae_controller_timer(ticks)
 
 #endif
 

source/6LoWPAN/ws/ws_pae_lib.c

@@ -213,10 +213,10 @@ void ws_pae_lib_supp_list_slow_timer_update(supp_list_t *supp_list, timer_settin
 {
     ns_list_foreach(supp_entry_t, entry, supp_list) {
         if (sec_prot_keys_pmk_lifetime_decrement(&entry->sec_keys, timer_settings->pmk_lifetime, seconds)) {
-            tr_info("PMK and PTK expired, eui-64: %s, system time: %i", trace_array(kmp_address_eui_64_get(entry->addr), 8), protocol_core_monotonic_time / 10);
+            tr_info("PMK and PTK expired, eui-64: %s, system time: %"PRIx32"", trace_array(kmp_address_eui_64_get(entry->addr), 8), protocol_core_monotonic_time / 10);
         }
         if (sec_prot_keys_ptk_lifetime_decrement(&entry->sec_keys, timer_settings->ptk_lifetime, seconds)) {
-            tr_info("PTK expired, eui-64: %s, system time: %i", trace_array(kmp_address_eui_64_get(entry->addr), 8), protocol_core_monotonic_time / 10);
+            tr_info("PTK expired, eui-64: %s, system time: %"PRIx32"", trace_array(kmp_address_eui_64_get(entry->addr), 8), protocol_core_monotonic_time / 10);
         }
     }
 

source/6LoWPAN/ws/ws_pae_timers.c

@@ -117,7 +117,7 @@ static void ws_pae_timers_calculate(timer_settings_t *timer_settings)
         time_to_update = gtk_revocation_lifetime - new_activation_time;
     }
 
-    tr_info("Key timers revocation lifetime: %i, new activation time: %i, max mismatch %i, time to update: %i", gtk_revocation_lifetime, new_activation_time, timer_settings->gtk_max_mismatch, time_to_update);
+    tr_info("Key timers revocation lifetime: %"PRIx32", new activation time: %"PRIx32", max mismatch %i, time to update: %"PRIx32"", gtk_revocation_lifetime, new_activation_time, timer_settings->gtk_max_mismatch, time_to_update);
 
     // If time to update results smaller GTK request Imax use it for calculation otherwise use GTK max mismatch
     if (time_to_update < timer_settings->gtk_max_mismatch) {

source/Security/protocols/sec_prot_keys.c

@@ -564,7 +564,7 @@ bool sec_prot_keys_gtks_hash_update(sec_prot_gtk_keys_t *gtks, uint8_t *gtkhash)
             if (sec_prot_keys_gtk_is_set(gtks, i)) {
                 uint32_t lifetime = sec_prot_keys_gtk_lifetime_get(gtks, i);
                 if (lifetime > GTK_EXPIRE_MISMATCH_TIME) {
-                    tr_info("GTK mismatch %i expired time, lifetime: %i", i, lifetime);
+                    tr_info("GTK mismatch %i expired time, lifetime: %"PRIx32"", i, lifetime);
                     mismatch = true;
                 }
                 sec_prot_keys_gtk_clear(gtks, i);
@@ -626,7 +626,7 @@ int8_t sec_prot_keys_gtk_install_order_last_get(sec_prot_gtk_keys_t *gtks)
 int8_t sec_prot_keys_gtk_install_order_last_index_get(sec_prot_gtk_keys_t *gtks)
 {
     int8_t install_order = -1;
-    uint8_t index = -1;
+    int8_t index = -1;
 
     // Gets the last key index
     for (uint8_t i = 0; i < GTK_NUM; i++) {

source/Security/protocols/sec_prot_lib.c

@@ -402,7 +402,7 @@ int8_t sec_prot_lib_gtk_read(uint8_t *kde, uint16_t kde_len, sec_prot_keys_t *se
         }
     }
 
-    tr_info("GTK recv index %i lifetime %i", gtk_index, sec_prot_keys_gtk_lifetime_get(sec_keys->gtks, gtk_index));
+    tr_info("GTK recv index %i lifetime %"PRIx32"", gtk_index, sec_prot_keys_gtk_lifetime_get(sec_keys->gtks, gtk_index));
 
     return 0;
 }

test/nanostack/unittest/stub/ws_pae_controller_stub.c

@@ -39,7 +39,12 @@
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan_interface.h"
 
-void ws_pae_controller_timer(uint16_t ticks)
+void ws_pae_controller_fast_timer(uint16_t ticks)
+{
+
+}
+
+void ws_pae_controller_slow_timer(uint16_t seconds)
 {
 
 }