Merge pull request #75 from yan-foto/feature/warnings-fix

Fix compiler warnings

Author: tianyuan129

.travis.yml

@@ -0,0 +1,17 @@
+os: linux
+dist: focal
+language: c
+
+addons:
+  apt:
+    update: true
+    packages:
+      - libcunit1
+      - cmake
+
+script:
+  - cd tests
+  - mkdir build && cd build
+  - cmake -DCMAKE_BUILD_TYPE=Debug ..
+  - make
+  - ./unittest

app-support/access-control.c

@@ -11,6 +11,7 @@
 #include "access-control.h"
 #include "security-bootstrapping.h"
 #include "../ndn-services.h"
+#include "../ndn-error-code.h"
 #include "../encode/key-storage.h"
 #include "../encode/signed-interest.h"
 #include "../encode/encrypted-payload.h"
@@ -22,6 +23,8 @@
 #include "../util/msg-queue.h"
 #include "../util/uniform-time.h"
 
+#include <inttypes.h>
+
 #define KEY_LIFTIME 60000
 
 /* Logging Level: ERROR, DEBUG */
@@ -100,7 +103,7 @@ _init_ac_state()
   _ac_initialized = true;
 }
 
-void 
+void
 _ac_timeout()
 {
   ndn_time_ms_t now = ndn_time_now_ms();
@@ -138,23 +141,25 @@ _on_ac_notification(const uint8_t* interest, uint32_t interest_size, void* userd
   ndn_interest_from_block(&notification, interest, interest_size);
   // /[home-prefix]/NDN_SD_AC/NOTIFY/[service-id]/keyid
   NDN_LOG_DEBUG("[ACCESSCTL] Notification: ");
-  NDN_LOG_DEBUG_NAME(&notification);
+  NDN_LOG_DEBUG_NAME(&notification.name);
 
   ndn_aes_key_t* key = ndn_ac_get_key_for_service(notification.name.components[3].value[0]);
   uint32_t keyid;
   ndn_decoder_t decoder;
   decoder_init(&decoder, notification.name.components[4].value, notification.name.components[4].size);
   decoder_get_uint32_value(&decoder, &keyid);
   if (key && key->key_id <= keyid) {
-      NDN_LOG_DEBUG("[ACCESSCTL] Enforced update for Service %u, KeyID %lu\n", 
+      NDN_LOG_DEBUG("[ACCESSCTL] Enforced update for Service %" PRIu32 ", KeyID %" PRIu32 "\n",
       notification.name.components[3].value[0], keyid);
       for (int i = 0; i < 10; i++) {
         if (_ac_self_state.self_services[i] == notification.name.components[3].value[0])
           _express_ekey_interest(notification.name.components[3].value[0]);
         if (_ac_self_state.access_services[i] == notification.name.components[3].value[0])
-          _express_dkey_interest(notification.name.components[3].value[0]);   
+          _express_dkey_interest(notification.name.components[3].value[0]);
       }
   }
+
+  return NDN_SUCCESS;
 }
 
 /**
@@ -205,7 +210,7 @@ _on_ekey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
     NDN_LOG_ERROR("[ACCESSCTL] Cannot get the AES KeyID, Error code is %d\n", ret);
     return;
   }
-  NDN_LOG_DEBUG("[ACCESSCTL] AES KeyID = %lu \n", keyid);
+  NDN_LOG_DEBUG("[ACCESSCTL] AES KeyID = %" PRIu32 "\n", keyid);
 
   // set lifetime
   expires_in = KEY_LIFTIME;
@@ -220,8 +225,8 @@ _on_ekey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
       if (_ac_self_state.self_services[i] == service) {
         _ac_self_state.ekeys[i].key_id = keyid;
         _ac_self_state.ekeys[i].expires_at = expires_in + now;
-        NDN_LOG_DEBUG("[ACCESSCTL] New expiration time is %ld, New keyid is %u\n", 
-                      _ac_self_state.ekeys[i].expires_at, _ac_self_state.ekeys[i].key_id);      
+        NDN_LOG_DEBUG("[ACCESSCTL] New expiration time is %ld, New keyid is %u\n",
+                      _ac_self_state.ekeys[i].expires_at, _ac_self_state.ekeys[i].key_id);
         ndn_aes_key_init(ekey, value, NDN_AES_BLOCK_SIZE, _ac_self_state.ekeys[i].key_id);
         _ac_self_state.ekeys[i].in_renewal = false;
       }
@@ -250,7 +255,7 @@ _on_ekey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
   }
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[ACCESSCTL] Key update: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[ACCESSCTL] Key update: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
  // _ac_timeout();
@@ -305,7 +310,7 @@ _on_dkey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
     NDN_LOG_ERROR("[ACCESSCTL] Cannot get the AES KeyID, Error code is %d\n", ret);
     return;
   }
-  NDN_LOG_DEBUG("[ACCESSCTL] AES KeyID = %lu \n", keyid);
+  NDN_LOG_DEBUG("[ACCESSCTL] AES KeyID = %" PRIu32 " \n", keyid);
 
   // set lifetime to 3000ms
   expires_in = KEY_LIFTIME;
@@ -320,8 +325,8 @@ _on_dkey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
       if (_ac_self_state.access_services[i] == service) {
         _ac_self_state.ekeys[i].key_id = keyid;
         _ac_self_state.access_keys[i].expires_at = expires_in + now;
-        NDN_LOG_DEBUG("[ACCESSCTL] New expiration time is %ld, New keyid is %u\n", 
-                      _ac_self_state.access_keys[i].expires_at, _ac_self_state.access_keys[i].key_id);      
+        NDN_LOG_DEBUG("[ACCESSCTL] New expiration time is %ld, New keyid is %u\n",
+                      _ac_self_state.access_keys[i].expires_at, _ac_self_state.access_keys[i].key_id);
         ndn_aes_key_init(access_key, value, NDN_AES_BLOCK_SIZE, _ac_self_state.access_keys[i].key_id);
         _ac_self_state.access_keys[i].in_renewal = false;
       }
@@ -391,7 +396,7 @@ _express_ekey_interest(uint8_t service)
 
   // signature signing
   ndn_name_t* self_identity = ndn_key_storage_get_self_identity(service);
-  ndn_name_t* self_identity_key = ndn_key_storage_get_self_identity_key(service);
+  ndn_ecc_prv_t* self_identity_key = ndn_key_storage_get_self_identity_key(service);
   if (self_identity == NULL || self_identity_key == NULL) {
     NDN_LOG_ERROR("[ACCESSCTL] Cannot find proper identity to sign");
     return NDN_AC_KEY_NOT_FOUND;
@@ -569,16 +574,16 @@ ndn_ac_after_bootstrapping()
 
 int
 ndn_ac_trigger_expiration(uint8_t service, uint32_t received_keyid)
-{ 
+{
   int ret = -1;
   // check if it's a local key
   ndn_aes_key_t* aes_key = ndn_ac_get_key_for_service(service);
   if (aes_key->key_id < received_keyid) {
-    NDN_LOG_DEBUG("[ACCESSCTL] Local Decryption Key %ld forced expired\n", aes_key->key_id);
+    NDN_LOG_DEBUG("[ACCESSCTL] Local Decryption Key %" PRIu32 " forced expired\n", aes_key->key_id);
     _express_dkey_interest(service);
   }
   else {
-    NDN_LOG_DEBUG("[ACCESSCTL] Notifying Encryption Key %ld forced expired\n", received_keyid);
+    NDN_LOG_DEBUG("[ACCESSCTL] Notifying Encryption Key %" PRIu32 " forced expired\n", received_keyid);
     ndn_interest_t interest;
     ndn_interest_init(&interest);
     ndn_key_storage_t* storage = ndn_key_storage_get_instance();
@@ -596,4 +601,6 @@ ndn_ac_trigger_expiration(uint8_t service, uint32_t received_keyid)
     ret = ndn_forwarder_express_interest_struct(&interest, NULL, NULL, NULL);
     if (ret != 0) return ret;
   }
+
+  return NDN_SUCCESS;
 }

app-support/ndn-sig-verifier.c

@@ -54,7 +54,6 @@ sig_verifier_on_data(const uint8_t* raw_data, uint32_t data_size, void* userdata
   if (result == NDN_SUCCESS) {
     // add the received certificate to key storage
     ndn_key_storage_add_trusted_certificate(&cert);
-    uint32_t keyid_from_cert = key_id_from_cert_name(&cert.name);
     ndn_ecc_pub_t* pub_key = NULL;
     // verify the original interest/data
     if (dataptr->is_interest) {
@@ -172,7 +171,7 @@ ndn_sig_verifier_verify_int(const uint8_t* raw_pkt, size_t pkt_size,
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-DECODING: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-DECODING: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
   if (!ndn_interest_is_signed(&interest)) {
@@ -256,7 +255,7 @@ ndn_sig_verifier_verify_int(const uint8_t* raw_pkt, size_t pkt_size,
 }
 
 void
-ndn_sig_verifier_verify_data(const uint8_t* raw_pkt, size_t pkt_size, 
+ndn_sig_verifier_verify_data(const uint8_t* raw_pkt, size_t pkt_size,
                              on_data_verification_success on_success, void* on_success_userdata,
                              on_data_verification_failure on_failure, void* on_failure_userdata)
 {
@@ -271,7 +270,7 @@ ndn_sig_verifier_verify_data(const uint8_t* raw_pkt, size_t pkt_size,
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-DECODING: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-DECODING: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
   if (data.signature.sig_type < 0 || data.signature.sig_type > 4) {
@@ -308,7 +307,7 @@ ndn_sig_verifier_verify_data(const uint8_t* raw_pkt, size_t pkt_size,
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-ECDSA-VERIFY: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-ECDSA-VERIFY: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
       if (result == NDN_SUCCESS) on_success(&data, on_success_userdata);
@@ -333,7 +332,7 @@ ndn_sig_verifier_verify_data(const uint8_t* raw_pkt, size_t pkt_size,
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-HMAC-VERIFY: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[SIGVERIFIER] DATA-PKT-HMAC-VERIFY: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
       if (result == NDN_SUCCESS) on_success(&data, on_success_userdata);
@@ -347,7 +346,7 @@ ndn_sig_verifier_verify_data(const uint8_t* raw_pkt, size_t pkt_size,
     memcpy(&cert_interest.name, &data.signature.key_locator_name, sizeof(ndn_name_t));
 #if ENABLE_NDN_LOG_DEBUG
     NDN_LOG_DEBUG("[SIGVERIFIER] Interest Sent out from SigVerifier: ");
-    NDN_LOG_DEBUG_NAME(&cert_interest);
+    NDN_LOG_DEBUG_NAME(&cert_interest.name);
 #endif
     ndn_interest_set_CanBePrefix(&cert_interest, true);
     ndn_interest_set_MustBeFresh(&cert_interest, false);

app-support/pub-sub.c

@@ -209,7 +209,7 @@ _on_new_content_verify_success(ndn_data_t* data, void* userdata)
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[PUB/SUB] SUB-NEW-DATA-AES-DEC: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[PUB/SUB] SUB-NEW-DATA-AES-DEC: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
   if (ret != NDN_SUCCESS) {
@@ -254,14 +254,14 @@ _on_new_content_verify_success(ndn_data_t* data, void* userdata)
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[PUB/SUB] SUB-NEW-DATA-SCHEMA-VERIFY: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[PUB/SUB] SUB-NEW-DATA-SCHEMA-VERIFY: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
   if (ret != NDN_SUCCESS) {
     NDN_LOG_ERROR("[PUB/SUB] Cannot verify incoming content against trust schemas. Error code: %d\n", ret);
     return;
   }
-  NDN_LOG_DEBUG("[PUB/SUB] NEW-DATA-FINSIH-VERIFICATION-TP: %llu ms\n", ndn_time_now_ms());
+  NDN_LOG_DEBUG("[PUB/SUB] NEW-DATA-FINSIH-VERIFICATION-TP: %" PRI_ndn_time_us_t " ms\n", ndn_time_now_ms());
   // command FORMAT: /home/service/CMD/identifier[0,2]/command
   // data FORMAT: /home/service/DATA/identifier[0,2]/data-identifier
 
@@ -310,7 +310,7 @@ _on_new_content(const uint8_t* raw_data, uint32_t data_size, void* userdata)
     return;
   }
   NDN_LOG_INFO("[PUB/SUB] Received new published content/command");
-  NDN_LOG_DEBUG("[PUB/SUB] NEW-DATA-ARRIVE-TP: %llu ms\n", ndn_time_now_ms());
+  NDN_LOG_DEBUG("[PUB/SUB] NEW-DATA-ARRIVE-TP: %" PRI_ndn_time_us_t " ms\n", ndn_time_now_ms());
   NDN_LOG_DEBUG("[PUB/SUB] SUB-NEW-DATA-PKT-SIZE: %u Bytes\n", data_size);
   topic->received_content = true;
   memcpy(topic->last_digest, pkt_encoding_buf, 16);
@@ -627,7 +627,7 @@ ps_publish_content(uint8_t service, const ps_event_t* event)
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[PUB/SUB] PUB-CONTENT-DATA-AES-ENC: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[PUB/SUB] PUB-CONTENT-DATA-AES-ENC: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
 
@@ -647,12 +647,12 @@ ps_publish_content(uint8_t service, const ps_event_t* event)
   }
   // select identity key
   ndn_name_t* signing_identity = ndn_key_storage_get_self_identity(service);
-  ndn_name_t* signing_identity_key = ndn_key_storage_get_self_identity_key(service);
+  ndn_ecc_prv_t* signing_identity_key = ndn_key_storage_get_self_identity_key(service);
   if (signing_identity == NULL || signing_identity_key == NULL) {
     NDN_LOG_ERROR("[PUB/SUB] Cannot find proper identity to sign");
     return;
   }
-  ret = tlv_make_data(topic->cache, sizeof(topic->cache), &topic->cache_size, 7,
+  ret = tlv_make_data(topic->cache, sizeof(topic->cache), (size_t *) &topic->cache_size, 7,
                       TLV_DATAARG_NAME_PTR, &name,
                       TLV_DATAARG_CONTENT_BUF, pkt_encoding_buf,
                       TLV_DATAARG_CONTENT_SIZE, used_size,
@@ -749,7 +749,7 @@ ps_publish_command(uint8_t service, const char* scope, const ps_event_t* event)
 
 #if ENABLE_NDN_LOG_DEBUG
   m_measure_tp2 = ndn_time_now_us();
-  NDN_LOG_DEBUG("[PUB/SUB] PUB-COMMAND-DATA-AES-ENC: %lluus\n", m_measure_tp2 - m_measure_tp1);
+  NDN_LOG_DEBUG("[PUB/SUB] PUB-COMMAND-DATA-AES-ENC: %" PRI_ndn_time_us_t "\n", m_measure_tp2 - m_measure_tp1);
 #endif
 
   uint32_t default_freshness_period = 0;
@@ -762,12 +762,12 @@ ps_publish_command(uint8_t service, const char* scope, const ps_event_t* event)
   }
   // select identity key
   ndn_name_t* signing_identity = ndn_key_storage_get_self_identity(service);
-  ndn_name_t* signing_identity_key = ndn_key_storage_get_self_identity_key(service);
+  ndn_ecc_prv_t* signing_identity_key = ndn_key_storage_get_self_identity_key(service);
   if (signing_identity == NULL || signing_identity_key == NULL) {
     NDN_LOG_ERROR("[PUB/SUB] Cannot find proper identity to sign");
     return;
   }
-  ret = tlv_make_data(topic->cache, sizeof(topic->cache), &topic->cache_size, 7,
+  ret = tlv_make_data(topic->cache, sizeof(topic->cache), (size_t *) &topic->cache_size, 7,
                       TLV_DATAARG_NAME_PTR, &name,
                       TLV_DATAARG_CONTENT_BUF, pkt_encoding_buf,
                       TLV_DATAARG_CONTENT_SIZE, used_size,
@@ -796,7 +796,7 @@ ps_publish_command(uint8_t service, const char* scope, const ps_event_t* event)
 
   // send out the notification Interest
   uint32_t buffer_length = 0;
-  tlv_make_interest(pkt_encoding_buf, sizeof(pkt_encoding_buf), &buffer_length, 3,
+  tlv_make_interest(pkt_encoding_buf, sizeof(pkt_encoding_buf), (size_t *) &buffer_length, 3,
                     TLV_INTARG_NAME_PTR, &name,
                     TLV_INTARG_CANBEPREFIX_BOOL, true,
                     TLV_INTARG_MUSTBEFRESH_BOOL, true);