From 3b93225c6b0e00d22a45410b67cf23c66e619422 Mon Sep 17 00:00:00 2001 From: "bg.chun" Date: Wed, 30 Nov 2016 19:19:16 +0900 Subject: [PATCH] [tizen]Modify bt_edr adapter to apply new logger Modify tizen bt_edr apdapter to apply new logger which is Analyzer. Change-Id: I49d57a1d633c1d899494567080763f4ebdb26ccb Signed-off-by: bg.chun Reviewed-on: https://gerrit.iotivity.org/gerrit/14961 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Jaehong Jo Reviewed-by: Ashok Babu Channa --- .../src/bt_edr_adapter/tizen/caedrclient.c | 8 +++---- .../src/bt_edr_adapter/tizen/caedrendpoint.c | 27 +++++++++++++++++----- .../src/bt_edr_adapter/tizen/caedrendpoint.h | 4 ++-- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c index 3e276bf..c22c476 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c @@ -211,8 +211,8 @@ void CAEDRSocketConnectionStateCallback(int result, bt_socket_connection_state_e while (device->pendingDataList) { EDRData *edrData = device->pendingDataList->data; - res = CAEDRSendData(device->socketFD, edrData->data, - edrData->dataLength); + res = CAEDRSendData(device->socketFD, device->remoteAddress, + edrData->data, edrData->dataLength); if (CA_STATUS_OK != res) { OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Failed to send pending data [%s]", @@ -753,7 +753,7 @@ CAResult_t CAEDRClientSendUnicastData(const char *remoteAddress, } else { - result = CAEDRSendData(device->socketFD, data, dataLength); + result = CAEDRSendData(device->socketFD, device->remoteAddress, data, dataLength); if (CA_STATUS_OK != result) { OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to send data!"); @@ -826,7 +826,7 @@ CAResult_t CAEDRClientSendMulticastData(const uint8_t *data, } else { - result = CAEDRSendData(device->socketFD, data, dataLength); + result = CAEDRSendData(device->socketFD, device->remoteAddress ,data, dataLength); if (CA_STATUS_OK != result) { OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Failed to send data to [%s] !", diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c index 78af3ff..319af2b 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c @@ -29,11 +29,12 @@ #include "caedrutils.h" #include "logger.h" -CAResult_t CAEDRSendData(int serverFD, const void *data, uint32_t dataLength) +CAResult_t CAEDRSendData(int serverFD, const char *addr, const void *data, uint32_t dataLength) { OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN"); VERIFY_NON_NULL(data, EDR_ADAPTER_TAG, "Data is null"); + VERIFY_NON_NULL(addr, EDR_ADAPTER_TAG, "Addr is null"); if (0 > serverFD) { @@ -42,14 +43,28 @@ CAResult_t CAEDRSendData(int serverFD, const void *data, uint32_t dataLength) } int dataLen = bt_socket_send_data(serverFD, (const char *)data, dataLength); - if (dataLen == -1) + int errcode = get_last_result(); + + if (TIZEN_ERROR_NONE == errcode) { - OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "sending data failed!, soketid [%d]", serverFD); - return CA_SOCKET_OPERATION_FAILED; + CALogSendStateInfo(CA_ADAPTER_RFCOMM_BTEDR, addr, 0, dataLength, true, NULL); } - else if (dataLen == 0) + else { - OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "soketid [%d] may be disconnected?", serverFD); + if (dataLen == -1) + { + OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "sending data failed!, soketid [%d] errmsg [%s]", + serverFD, get_error_message(errcode)); + } + else if (dataLen == 0) + { + OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "soketid [%d] may be disconnected? errmsg [%s]", + serverFD, get_error_message(errcode)); + } + + CALogSendStateInfo(CA_ADAPTER_RFCOMM_BTEDR, addr, 0, dataLength, + false, get_error_message(errcode)); + return CA_SOCKET_OPERATION_FAILED; } diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h index 63ee31c..b5387fd 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h +++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h @@ -28,7 +28,7 @@ #define CA_EDR_ENDPOINT_H_ #include - +#include #include "cacommon.h" #ifdef __cplusplus @@ -48,7 +48,7 @@ extern "C" * @retval ::CA_STATUS_INVALID_PARAM Invalid input arguments. * @retval ::CA_STATUS_FAILED Operation failed. */ -CAResult_t CAEDRSendData(int serverFD, const void *data, uint32_t dataLength); +CAResult_t CAEDRSendData(int serverFD, const char *addr, const void *data, uint32_t dataLength); #ifdef __cplusplus } /* extern "C" */ -- 2.7.4