Added logging of tokens as hex for readability.

Tokens being printed as hex.
Removed printing of ASCII tokens as token not guranteed to be null
terminated. There seems to be some discussion about this issue in
IOT-380.

Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Change-Id: I9756c552f3abc3acdadb9e9fe4b9eb20d7ecf3eb
Reviewed-on: https://gerrit.iotivity.org/gerrit/501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c
index 72955bf..75ecb61 100644 (file)
--- a/resource/csdk/connectivity/src/camessagehandler.c
+++ b/resource/csdk/connectivity/src/camessagehandler.c
@@ -245,7 +245,9 @@ static void CASendThreadProcess(void *threadData)
 
             OIC_LOG_V(DEBUG, TAG, "PDU Maker - id : %d", ntohs(pdu->hdr->id));
 
-            OIC_LOG_V(DEBUG, TAG, "PDU Maker - token : %s", pdu->hdr->token);
+            OIC_LOG(DEBUG, TAG, "PDU Maker - token :");
+
+            OIC_LOG_BUFFER(DEBUG, TAG, pdu->hdr->token, pdu->hdr->token_length);
 
             res = CASendUnicastData(data->remoteEndpoint, pdu->hdr, pdu->length);
 
@@ -278,7 +280,9 @@ static void CASendThreadProcess(void *threadData)
 
             OIC_LOG_V(DEBUG, TAG, "PDU Maker - id : %d", ntohs(pdu->hdr->id));
 
-            OIC_LOG_V(DEBUG, TAG, "PDU Maker - token : %s", pdu->hdr->token);
+            OIC_LOG(DEBUG, TAG, "PDU Maker - token");
+
+            OIC_LOG_BUFFER(DEBUG, TAG, pdu->hdr->token, pdu->hdr->token_length);
 
             res = CASendMulticastData(pdu->hdr, pdu->length);
             coap_delete_pdu(pdu);
@@ -346,7 +350,8 @@ static void CAReceivedPacketCallback(CARemoteEndpoint_t *endpoint, void *data,
         OIC_LOG_V(DEBUG, TAG, "Request- code: %d", ReqInfo->method);
         if (NULL != ReqInfo->info.token)
         {
-            OIC_LOG_V(DEBUG, TAG, "Request- token : %s", ReqInfo->info.token);
+            OIC_LOG(DEBUG, TAG, "Request- token:");
+            OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) ReqInfo->info.token, CA_MAX_TOKEN_LEN);
         }
 
         if (NULL != endpoint)

diff --git a/resource/csdk/connectivity/src/camessagehandler_singlethread.c b/resource/csdk/connectivity/src/camessagehandler_singlethread.c
index af4678e..4e0082d 100644 (file)
--- a/resource/csdk/connectivity/src/camessagehandler_singlethread.c
+++ b/resource/csdk/connectivity/src/camessagehandler_singlethread.c
@@ -226,7 +226,8 @@ static void CAReceivedPacketCallback(CARemoteEndpoint_t *endpoint, void *data,
         }
 
         OIC_LOG_V(DEBUG, TAG, "Request- code: %d", ReqInfo->method);
-        OIC_LOG_V(DEBUG, TAG, "Request- token : %s", ReqInfo->info.token);
+        OIC_LOG(DEBUG, TAG, "Request- token:");
+        OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) ReqInfo->info.token, CA_MAX_TOKEN_LEN);
 
         if (NULL != endpoint)
         {

diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c
index fbbe5d8..1622ee6 100644 (file)
--- a/resource/csdk/connectivity/src/caprotocolmessage.c
+++ b/resource/csdk/connectivity/src/caprotocolmessage.c
@@ -585,7 +585,8 @@ CAResult_t CAGenerateTokenInternal(CAToken_t *token)
     // save token
     *token = temp;
 
-    OIC_LOG_V(DEBUG, TAG, "generate the token(%s)!!", *token);
+    OIC_LOG(DEBUG, TAG, "generate the token!!");
+    OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) *token, CA_MAX_TOKEN_LEN);
 
     OIC_LOG(DEBUG, TAG, "CAGenerateTokenInternal OUT");
     return CA_STATUS_OK;
@@ -596,8 +597,8 @@ void CADestroyTokenInternal(CAToken_t token)
     OIC_LOG(DEBUG, TAG, "CADestroyTokenInternal IN");
     if (token != NULL)
     {
-        OIC_LOG_V(DEBUG, TAG, "destroy the token(%s)!!", token);
-
+        OIC_LOG(DEBUG, TAG, "destroy the token!!");
+        OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) token, CA_MAX_TOKEN_LEN);
         OICFree(token);
         token = NULL;
     }

diff --git a/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c b/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c
index 6a64086..11113d1 100644 (file)
--- a/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c
+++ b/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c
@@ -575,7 +575,8 @@ CAResult_t CAGenerateTokenInternal(CAToken_t *token)
     // save token
     *token = temp;
 
-    OIC_LOG_V(DEBUG, TAG, "gen token(%s)", *token);
+    OIC_LOG(DEBUG, TAG, "gen token:");
+    OIC_LOG_BUFFER(DEBUG, TAG, (const uint8_t *) *token, CA_MAX_TOKEN_LEN);
     OIC_LOG(DEBUG, TAG, "OUT");
     return CA_STATUS_OK;
 }