From: Hongkuk, Son <hongkuk.son@samsung.com>
Date: Thu, 9 Nov 2017 08:05:21 +0000 (+0900)
Subject: Update snapshot(2017-11-08)
X-Git-Tag: accepted/tizen/4.0/unified/20171115.173851~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F159496%2F1;p=platform%2Fupstream%2Fiotivity.git

Update snapshot(2017-11-08)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Icbbce23a651f542fe2bf3c98ba4eb3d6bb96274a
---

diff --git a/packaging/snapshot_history.txt b/packaging/snapshot_history.txt
index 5122241..7de6bb0 100755
--- a/packaging/snapshot_history.txt
+++ b/packaging/snapshot_history.txt
@@ -1,3 +1,9 @@
+http://suprem.sec.samsung.net/jira/browse/CONPRO-1124
+
+commit_info_2017-11-08.txt
+
+commit_id: 88be5dfc47b6b73038d62d5dda6076ed571ecfdb
+----------------------------------------------------------------------------------------------------------------------------------
 http://suprem.sec.samsung.net/jira/browse/CONPRO-1120
 
 commit_info_2017-11-02.txt
diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c
index 4f2f4a0..ff29b33 100755
--- a/resource/csdk/connectivity/src/caprotocolmessage.c
+++ b/resource/csdk/connectivity/src/caprotocolmessage.c
@@ -204,6 +204,7 @@ coap_pdu_t *CAParsePDU(const char *data, uint32_t length, uint32_t *outCode,
     if (NULL == outpdu)
     {
         OIC_LOG(ERROR, TAG, "outpdu is null");
+        OIC_LOG_V(ERROR, TAG, "data length: %u", length);
         return NULL;
     }
 
diff --git a/resource/csdk/connectivity/src/ip_adapter/caipserver.c b/resource/csdk/connectivity/src/ip_adapter/caipserver.c
index d54de56..f4484b9 100644
--- a/resource/csdk/connectivity/src/ip_adapter/caipserver.c
+++ b/resource/csdk/connectivity/src/ip_adapter/caipserver.c
@@ -124,6 +124,11 @@ static struct in6_addr IPv6MulticastAddressOrg;
 #define IPv6_MULTICAST_GLB "ff0e::158"
 static struct in6_addr IPv6MulticastAddressGlb;
 
+/*
+ * Buffer size for the receive message buffer
+ */
+#define RECV_MSG_BUF_LEN 16384
+
 static char *ipv6mcnames[IPv6_DOMAINS] = {
     NULL,
     IPv6_MULTICAST_INT,
@@ -605,7 +610,7 @@ void CADeInitializeIPGlobals()
 static CAResult_t CAReceiveMessage(CASocketFd_t fd, CATransportFlags_t flags)
 {
     OIC_LOG(DEBUG, TAG, "IN - CAReceiveMessage");
-    char recvBuffer[COAP_MAX_PDU_SIZE] = {0};
+    char recvBuffer[RECV_MSG_BUF_LEN] = {0};
 
     size_t len = 0;
     int level = 0;
diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
index eaee7f3..f698c88 100644
--- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
+++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
@@ -1062,6 +1062,7 @@ size_t CACheckPayloadLengthFromHeader(const void *data, size_t dlen)
     if (!pdu)
     {
         OIC_LOG(ERROR, TAG, "outpdu is null");
+        OIC_LOG_V(ERROR, TAG, "data length: %zu", dlen);
         return 0;
     }