From 00d9d4590cb78ad16752b06f80e0fea8b77b5d97 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Fri, 11 Sep 2015 15:53:46 -0700 Subject: [PATCH] Addressed endpoint pointer type mismatches in LE adapter. Corrected a pointer type mismatch in the BLE adapter implementation introduced by commit 6c0321f5 where the endpoint parameter of the network packet received callback was changed from CAEndpoint_t* to CASecureEndpoint_t*. Change-Id: Id7413f2085fe7e230be811723ff0392bb11efd33 Signed-off-by: Ossama Othman Reviewed-on: https://gerrit.iotivity.org/gerrit/2488 Tested-by: jenkins-iotivity Reviewed-by: Patrick Lankswert --- .../connectivity/src/bt_le_adapter/caleadapter.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c b/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c index 2a198db..d4ced58 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c @@ -844,9 +844,17 @@ static void CALEDataReceiverHandler(void *threadData) ca_mutex_unlock(g_bleReceiveDataMutex); return; } + OIC_LOG(DEBUG, CALEADAPTER_TAG, "Sending data up !"); - g_networkPacketReceivedCallback(senderInfo->remoteEndpoint, - senderInfo->defragData, senderInfo->recvDataLen); + + const CASecureEndpoint_t tmp = + { + .endpoint = *senderInfo->remoteEndpoint + }; + + g_networkPacketReceivedCallback(&tmp, + senderInfo->defragData, + senderInfo->recvDataLen); ca_mutex_unlock(g_bleAdapterReqRespCbMutex); u_arraylist_remove(g_senderInfo, senderIndex); senderInfo->remoteEndpoint = NULL; @@ -2180,11 +2188,12 @@ static CAResult_t CALEAdapterServerReceivedData(const char *remoteAddress, #ifdef SINGLE_THREAD if(g_networkPacketReceivedCallback) { - CAEndpoint_t endPoint = - { .adapter = CA_ADAPTER_GATT_BTLE }; // will be filled by - // upper layer + // will be filled by upper layer + const CASecureEndpoint_t endpoint = + { .endpoint = { .adapter = CA_ADAPTER_GATT_BTLE } }; + - g_networkPacketReceivedCallback(&endPoint, data, dataLength); + g_networkPacketReceivedCallback(&endpoint, data, dataLength); } #else VERIFY_NON_NULL_RET(g_bleReceiverQueue, -- 2.7.4