From ff723f82ac6a9a51e097e1430df41ecbf32f2d6f Mon Sep 17 00:00:00 2001 From: Minji Park Date: Fri, 18 Nov 2016 11:48:12 +0900 Subject: [PATCH] [IOT-1576] Changed error handling logic when tls message send failed - Changed error handling logic when tls message send failed in tcpadapter. Change-Id: I22d11d34d2092a7f452d41be9f243dcfdf16a02d Signed-off-by: Hyuna Jo Signed-off-by: Minji Park Reviewed-on: https://gerrit.iotivity.org/gerrit/14493 Tested-by: jenkins-iotivity Reviewed-by: jihwan seo Reviewed-by: Phil Coval Reviewed-by: Jaehong Jo Reviewed-by: Ashok Babu Channa (cherry picked from commit 5f39be87c9c3a9c657c9828260a9db5e383cee6c) Reviewed-on: https://gerrit.iotivity.org/gerrit/14771 --- resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c index aa5a7d3..f5d8f53 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c @@ -225,11 +225,6 @@ static ssize_t CATCPPacketSendCB(CAEndpoint_t *endpoint, const void *data, size_ OIC_LOG_BUFFER(DEBUG, TAG, data, dataLength); ssize_t ret = CATCPSendData(endpoint, data, dataLength); - if (-1 == ret) - { - CASearchAndDeleteTCPSession(endpoint); - CATCPErrorHandler(endpoint, data, dataLength, CA_SEND_FAILED); - } OIC_LOG_V(DEBUG, TAG, "Out %s : %d bytes sent", __func__, ret); return ret; } @@ -592,6 +587,9 @@ void CATCPSendDataThread(void *threadData) if (CA_STATUS_OK != result) { OIC_LOG(ERROR, TAG, "CAAdapterNetDtlsEncrypt failed!"); + CASearchAndDeleteTCPSession(tcpData->remoteEndpoint); + CATCPErrorHandler(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen, + CA_SEND_FAILED); } OIC_LOG_V(DEBUG, TAG, "CAAdapterNetDtlsEncrypt returned with result[%d]", result); @@ -602,6 +600,7 @@ void CATCPSendDataThread(void *threadData) ssize_t dlen = CATCPSendData(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen); if (-1 == dlen) { + OIC_LOG(ERROR, TAG, "CATCPSendData failed"); CASearchAndDeleteTCPSession(tcpData->remoteEndpoint); CATCPErrorHandler(tcpData->remoteEndpoint, tcpData->data, tcpData->dataLen, CA_SEND_FAILED); -- 2.7.4