#include "caedrinterface.h"
#include "caadapterutils.h"
#include "logger.h"
-#include "camsgparser.h"
#include "caqueueingthread.h"
#include "oic_malloc.h"
+#include "caremotehandler.h"
+#include "pdu.h"
/**
* @var EDR_ADAPTER_TAG
* @brief Logging tag for module name.
*/
-#define EDR_ADAPTER_TAG "CA_EDR_ADAPTER"
+#define EDR_ADAPTER_TAG "OIC_CA_EDR_ADAP"
/**
* @var g_edrThreadPool
static CAQueueingThread_t *g_recvQueueHandle = NULL;
/**
- * @var g_isHeaderAvailable
- * @brief to differentiate btw header and data packet.
- */
-static bool g_isHeaderAvailable = false;
-
-/**
* @var g_adapterState
* @brief Storing Adapter state information
*/
static CANetworkChangeCallback g_networkChangeCallback = NULL;
/**
- * @var g_localConnectivity
- * @brief Information of local Bluetooth adapter.
+ * @var g_errorCallback
+ * @brief error Callback to CA adapter
*/
-static CALocalConnectivity_t *g_localConnectivity = NULL;
+static CAErrorHandleCallback g_errorCallback = NULL;
/**
- * @var g_serverId
- * @brief Storing RfcommserverUUID
+ * @var g_localConnectivity
+ * @brief Information of local Bluetooth adapter.
*/
-static int g_serverId = -1;
+static CAEndpoint_t *g_localConnectivity = NULL;
/**
* @var g_serverState
void CAAdapterDataSendHandler(void *context);
void CAAdapterDataReceiverHandler(void *context);
CAResult_t CAAdapterStopQueue();
-void CAAdapterRecvData(const char *remoteAddress, const void *data, uint32_t dataLength,
+void CAAdapterRecvData(const char *remoteAddress, const uint8_t *data, uint32_t dataLength,
uint32_t *sentLength);
void CAEDRNotifyNetworkStatus(CANetworkStatus_t status);
void CAEDROnNetworkStatusChanged(void *context);
-CAResult_t CAAdapterSendData(const char *remoteAddress, const char *serviceUUID, const void *data,
- uint32_t dataLength, uint32_t *sentLength);
-CAEDRNetworkEvent *CAEDRCreateNetworkEvent(CALocalConnectivity_t *connectivity,
- CANetworkStatus_t status);
-CAResult_t CAEDRClientSendData(const char *remoteAddress, const char *serviceUUID,
- const void *data, uint32_t dataLength, uint32_t *sentLength);
+CAResult_t CAAdapterSendData(const char *remoteAddress, const char *serviceUUID,
+ const uint8_t *data, uint32_t dataLength, uint32_t *sentLength);
+CAEDRNetworkEvent *CAEDRCreateNetworkEvent(CAEndpoint_t *connectivity, CANetworkStatus_t status);
+CAResult_t CAEDRClientSendData(const char *remoteAddress, const uint8_t *data,
+ uint32_t dataLength);
+
/**
* @fn CACreateEDRData
* @brief Helper function to create CAEDRData
*/
-static CAEDRData *CACreateEDRData(const CARemoteEndpoint_t *remoteEndpoint, const void *data,
+static CAEDRData *CACreateEDRData(const CAEndpoint_t *remoteEndpoint, const uint8_t *data,
uint32_t dataLength);
/**
static void CAEDRDataDestroyer(void *data, uint32_t size);
+static void CAEDRErrorHandler(const char *remoteAddress, const uint8_t *data,
+ uint32_t dataLength, CAResult_t result);
+
CAResult_t CAInitializeEDR(CARegisterConnectivityCallback registerCallback,
CANetworkPacketReceivedCallback packetReceivedCallback,
CANetworkChangeCallback networkStateChangeCallback,
- ca_thread_pool_t handle)
+ CAErrorHandleCallback errorCallback, ca_thread_pool_t handle)
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
// Input validation
VERIFY_NON_NULL(registerCallback, EDR_ADAPTER_TAG, "register callback is NULL");
VERIFY_NON_NULL(packetReceivedCallback, EDR_ADAPTER_TAG, "data receive callback is NULL");
g_edrThreadPool = handle;
g_networkPacketReceivedCallback = packetReceivedCallback;
g_networkChangeCallback = networkStateChangeCallback;
+ g_errorCallback = errorCallback;
// Initialize EDR Network Monitor
- CAResult_t err = CAEDRInitializeNetworkMonitor(handle);
- if (CA_STATUS_OK != err)
+ CAResult_t res = CAEDRInitializeNetworkMonitor(handle);
+ if (CA_STATUS_OK != res)
{
OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "EDR N/w Monitor Initialize failed!, error number [%d]",
- err);
- return err;
+ res);
+ return res;
}
CAEDRSetNetworkChangeCallback(CAEDRNotifyNetworkStatus);
CAEDRSetPacketReceivedCallback(CAAdapterRecvData);
- CAEDRInitializeClient(handle);
-
- CAConnectivityHandler_t handler;
- handler.startAdapter = CAStartEDR;
- handler.startListenServer = CAStartEDRListeningServer;
- handler.startDiscoveryServer = CAStartEDRDiscoveryServer;
- handler.sendData = CASendEDRUnicastData;
- handler.sendDataToAll = CASendEDRMulticastData;
- handler.GetnetInfo = CAGetEDRInterfaceInformation;
- handler.readData = CAReadEDRData;
- handler.stopAdapter = CAStopEDR;
- handler.terminate = CATerminateEDR;
- registerCallback(handler, CA_EDR);
+ CAEDRSetErrorHandler(CAEDRErrorHandler);
+ res = CAEDRClientInitialize();
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "EDR Client Initialize failed, error number [%d]", res);
+ return res;
+ }
- // Initialize Send/Receive data message queues
- if (CA_STATUS_OK != CAEDRInitializeQueueHandlers())
+ res = CAEDRServerInitialize(handle);
+ if (CA_STATUS_OK != res)
{
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "CAAdapterInitializeQueues API failed");
- CATerminateEDR();
- return CA_STATUS_FAILED;
+ OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "EDR Server Initialize failed, error number [%d]", res);
+ return res;
}
+ static const CAConnectivityHandler_t handler =
+ {
+ .startAdapter = CAStartEDR,
+ .stopAdapter = CAStopEDR,
+ .startListenServer = CAStartEDRListeningServer,
+ .stopListenServer = CAStopEDRListeningServer,
+ .startDiscoveryServer = CAStartEDRDiscoveryServer,
+ .sendData = CASendEDRUnicastData,
+ .sendDataToAll = CASendEDRMulticastData,
+ .GetnetInfo = CAGetEDRInterfaceInformation,
+ .readData = CAReadEDRData,
+ .terminate = CATerminateEDR,
+ .cType = CA_ADAPTER_RFCOMM_BTEDR
+ };
+ registerCallback(handler);
+
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return CA_STATUS_OK;
}
CAResult_t CAStartEDR()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
//Start Monitoring EDR Network
CAResult_t ret = CAEDRStartNetworkMonitor();
if (CA_STATUS_OK != ret)
ret);
}
+ // Initialize Send/Receive data message queues
+ if (CA_STATUS_OK != (ret = CAEDRInitializeQueueHandlers()))
+ {
+ OIC_LOG_V(ERROR, EDR_ADAPTER_TAG,
+ "CAAdapterInitializeQueues failed!, error number [%d] ", ret);
+ CATerminateEDR();
+ return CA_STATUS_FAILED;
+ }
+
+ // Start Send/Receive data message queues
if (CA_STATUS_OK != (ret = CAAdapterStartQueue()))
{
OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "CAAdapterStartQueue failed!, error number [%d] ", ret);
}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return ret;
}
CAResult_t CAStartEDRListeningServer()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
return CAStartServer();
}
+CAResult_t CAStopEDRListeningServer()
+{
+ return CAEDRServerStop();
+}
+
CAResult_t CAStartEDRDiscoveryServer()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
+#ifdef __TIZEN__
+ // Start device discovery
+ CAResult_t result = CAEDRStartDeviceDiscovery();
+ if(CA_STATUS_OK != result)
+ {
+ OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Failed to Start Device discovery");
+ }
+#endif
return CAStartServer();
}
-int32_t CASendEDRUnicastData(const CARemoteEndpoint_t *remoteEndpoint, const void *data,
+int32_t CASendEDRUnicastData(const CAEndpoint_t *remoteEndpoint, const void *data,
uint32_t dataLength)
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
// Input validation
VERIFY_NON_NULL_RET(remoteEndpoint, EDR_ADAPTER_TAG, "Remote endpoint is null", -1);
VERIFY_NON_NULL_RET(data, EDR_ADAPTER_TAG, "Data is null", -1);
return -1;
}
- if (0 == strlen(remoteEndpoint->addressInfo.BT.btMacAddress))
+ if (0 == strlen(remoteEndpoint->addr))
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Invalid input: EDR Address is empty!");
return -1;
uint32_t sentLength = 0;
const char *serviceUUID = OIC_EDR_SERVICE_ID;
- const char *address = remoteEndpoint->addressInfo.BT.btMacAddress;
+ const char *address = remoteEndpoint->addr;
CAResult_t err = CAAdapterSendData(address, serviceUUID, data, dataLength, &sentLength);
if (CA_STATUS_OK != err)
{
OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Send unicast data failed!, error num [%d]", err);
+ g_errorCallback(remoteEndpoint, data, dataLength, err);
return -1;
}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return sentLength;
}
-int32_t CASendEDRMulticastData(const void *data, uint32_t dataLength)
+int32_t CASendEDRMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength)
{
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN - CASendEDRMulticastData");
if (CA_STATUS_OK != err)
{
OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Send multicast data failed!, error num [%d]", err);
+ g_errorCallback(endpoint, data, dataLength, err);
return -1;
}
return sentLen;
}
-
-CAResult_t CAGetEDRInterfaceInformation(CALocalConnectivity_t **info, uint32_t *size)
+CAResult_t CAGetEDRInterfaceInformation(CAEndpoint_t **info, uint32_t *size)
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
VERIFY_NON_NULL(info, EDR_ADAPTER_TAG, "LocalConnectivity info is null");
CAResult_t err = CA_STATUS_OK;
}
*size = 1;
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return err;
}
CAResult_t CAReadEDRData()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
return CAEDRManagerReadData();
}
CAResult_t CAStopEDR()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
// Stop RFComm server if it is running
- if (-1 != g_serverId)
- {
- CAEDRServerStop(g_serverId);
- g_serverId = -1;
- }
+ CAEDRServerStop();
// Stop network monitor
CAEDRStopNetworkMonitor();
// Stop Send and receive Queue
CAAdapterStopQueue();
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return CA_STATUS_OK;
}
void CATerminateEDR()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
- // Stop EDR adapter
- CAStopEDR();
// Terminate EDR Network Monitor
CAEDRTerminateNetworkMonitor();
CAEDRServerTerminate();
// Free LocalConnectivity information
- CAAdapterFreeLocalEndpoint(g_localConnectivity);
+ CAFreeEndpoint(g_localConnectivity);
g_localConnectivity = NULL;
-
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
}
CAResult_t CAStartServer()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
- CAResult_t err = CA_STATUS_OK;
-
if (false == g_adapterState)
{
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Bluetooth adapter is disabled!");
return CA_STATUS_OK;
}
- if (-1 < g_serverId)
- {
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Server is already in running state.");
- return CA_SERVER_STARTED_ALREADY;
- }
-
- if (CA_STATUS_OK != (err = CAEDRServerStart(OIC_EDR_SERVICE_ID, &g_serverId, g_edrThreadPool)))
+ CAResult_t err = CA_STATUS_OK;
+ if (CA_STATUS_OK != (err = CAEDRServerStart()))
{
OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Failed to start RFCOMM server!, error num [%d]",
err);
return err;
}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return err;
}
CAResult_t CAEDRInitializeQueueHandlers()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
if (CA_STATUS_OK == CAEDRInitializeSendHandler()
&& CA_STATUS_OK == CAEDRInitializeReceiveHandler())
{
return CA_STATUS_OK;
}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return CA_STATUS_FAILED;
}
CAResult_t CAEDRInitializeSendHandler()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
// Check if the message queue is already initialized
if (g_sendQueueHandle)
{
CAResult_t CAEDRInitializeReceiveHandler()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
// Check if the message queue is already initialized
if (g_recvQueueHandle)
{
return CA_MEMORY_ALLOC_FAILED;
}
+
if (CA_STATUS_OK != CAQueueingThreadInitialize(g_recvQueueHandle, g_edrThreadPool,
CAAdapterDataReceiverHandler,
CAEDRDataDestroyer))
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to Initialize send queue thread");
+ OICFree(g_recvQueueHandle);
+ g_recvQueueHandle = NULL;
return CA_STATUS_FAILED;
}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
return CA_STATUS_OK;
}
void CAAdapterTerminateQueues()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
if (g_sendQueueHandle)
{
CAQueueingThreadDestroy(g_sendQueueHandle);
CAQueueingThreadDestroy(g_recvQueueHandle);
g_recvQueueHandle = NULL;
}
-
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
}
void CAAdapterDataSendHandler(void *context)
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN - CAAdapterDataSendHandler");
CAEDRData *message = (CAEDRData *) context;
- if (NULL == message)
+ if (!message)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to get message!");
return;
}
- const char *remoteAddress = NULL;
- const char *serviceUUID = NULL;
- uint32_t sentLength = 0;
-
- if (NULL == message->remoteEndpoint)
+ if (!message->remoteEndpoint)
{
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "remoteEndpoint is not available");
- }
- else
- {
- remoteAddress = message->remoteEndpoint->addressInfo.BT.btMacAddress;
- serviceUUID = message->remoteEndpoint->resourceUri;
- }
-
- uint32_t dataSegmentLength = message->dataLen + CA_HEADER_LENGTH;
- uint32_t dataLen = message->dataLen;
- OIC_LOG_V(DEBUG, EDR_ADAPTER_TAG, "checking for fragmentation and the dataLen is %d",
- message->dataLen);
-
- char *header = (char *) OICCalloc(CA_HEADER_LENGTH, sizeof(char));
- VERIFY_NON_NULL_VOID(header, EDR_ADAPTER_TAG, "Memory allocation failed");
-
- char* dataSegment = (char *) OICCalloc(dataSegmentLength, sizeof(char));
- if (NULL == dataSegment)
- {
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Memory allocation failed");
- OICFree(header);
return;
}
- CAResult_t result = CAGenerateHeader(header, dataLen);
- if (CA_STATUS_OK != result)
- {
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Generate header failed");
- OICFree(header);
- OICFree(dataSegment);
- return ;
- }
-
- memcpy(dataSegment, header, CA_HEADER_LENGTH);
- OICFree(header);
- uint32_t length = 0;
- if (CA_SUPPORTED_EDR_MTU_SIZE > dataSegmentLength)
+ const char *remoteAddress = message->remoteEndpoint->addr;
+ if(!remoteAddress)
{
- length = dataSegmentLength;
- memcpy(dataSegment + CA_HEADER_LENGTH, message->data, dataLen);
- }
- else
- {
- length = CA_SUPPORTED_EDR_MTU_SIZE;
- memcpy(dataSegment + CA_HEADER_LENGTH, message->data,
- CA_SUPPORTED_EDR_MTU_SIZE - CA_HEADER_LENGTH);
+ OIC_LOG(ERROR, EDR_ADAPTER_TAG, "EDR Send Message error");
+ //Error cannot be sent if remote address is NULL
+ return;
}
- uint32_t iter = dataSegmentLength / CA_SUPPORTED_EDR_MTU_SIZE;
- uint32_t index = 0;
- if (CA_STATUS_OK != CAEDRClientSendData(remoteAddress, serviceUUID, dataSegment, length,
- &sentLength))
+ CAResult_t result = CAEDRClientSendData(remoteAddress, message->data, message->dataLen);
+ if(CA_STATUS_OK != result)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "CAEDRClientSendData API failed");
- OICFree(dataSegment);
+ CAEDRErrorHandler(remoteAddress, message->data, message->dataLen, result);
return;
}
- OICFree(dataSegment);
-
- for (index = 1; index < iter; index++)
- {
- // Send the remaining header.
- OIC_LOG_V(DEBUG, EDR_ADAPTER_TAG, "Sending the chunk number [%d]", index);
-
- if (CA_STATUS_OK != CAEDRClientSendData(remoteAddress, serviceUUID,
- message->data + ((index * CA_SUPPORTED_EDR_MTU_SIZE) - CA_HEADER_LENGTH),
- CA_SUPPORTED_EDR_MTU_SIZE, &sentLength))
- {
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "CAEDRClientSendData API failed");
- return;
- }
- }
-
- uint32_t remainingLen = dataSegmentLength % CA_SUPPORTED_EDR_MTU_SIZE;
- if (remainingLen && (dataSegmentLength > CA_SUPPORTED_EDR_MTU_SIZE))
- {
- // send the last segment of the data (Ex: 22 bytes of 622 bytes of data when MTU is 200)
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Sending the last chunk");
- if (CA_STATUS_OK != CAEDRClientSendData(remoteAddress, serviceUUID,
- message->data + (index * CA_SUPPORTED_EDR_MTU_SIZE) - CA_HEADER_LENGTH,
- remainingLen, &sentLength))
- {
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "CAEDRClientSendData API failed");
- return;
- }
- }
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
}
-CAResult_t CAEDRClientSendData(const char *remoteAddress, const char *serviceUUID,
- const void *data, uint32_t dataLength, uint32_t *sentLength)
+CAResult_t CAEDRClientSendData(const char *remoteAddress, const uint8_t *data,
+ uint32_t dataLength)
{
+ CAResult_t result = CA_SEND_FAILED;
// Send the first segment with the header.
if ((NULL != remoteAddress) && (0 < strlen(remoteAddress))) //Unicast data
{
- if (CA_STATUS_OK != CAEDRClientSendUnicastData(remoteAddress, serviceUUID, data,
- dataLength, sentLength))
+ result = CAEDRClientSendUnicastData(remoteAddress, data, dataLength);
+ if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to send unicast data !");
- return CA_STATUS_FAILED;
+ return result;
}
}
else
{
OIC_LOG_V(DEBUG, EDR_ADAPTER_TAG, "sending multicast data : %s", data);
- if (CA_STATUS_OK != CAEDRClientSendMulticastData(serviceUUID, data, dataLength,
- sentLength))
+ result = CAEDRClientSendMulticastData(data, dataLength);
+
+ if (CA_STATUS_OK != result)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to send multicast data !");
- return CA_STATUS_FAILED;
+ return result;
}
}
- return CA_STATUS_OK;
+ return result;
}
void CAAdapterDataReceiverHandler(void *context)
{
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN_CAAdapterDataReceiverHandler");
+ if (NULL == g_networkPacketReceivedCallback)
+ {
+ OIC_LOG(ERROR, EDR_ADAPTER_TAG, "g_networkPacketReceivedCallback is NULL");
+ return;
+ }
+
CAEDRData *message = (CAEDRData *) context;
- if (NULL == message)
+ if (NULL == message || NULL == message->remoteEndpoint)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to get message!");
return;
}
- static uint32_t recvDataLen = 0;
- static uint32_t totalDataLen = 0;
- static char *defragData = NULL;
- static CARemoteEndpoint_t *remoteEndpoint = NULL;
+ CAEndpoint_t *remoteEndpoint = CACreateEndpointObject(CA_DEFAULT_FLAGS,
+ CA_ADAPTER_RFCOMM_BTEDR,
+ message->remoteEndpoint->addr,
+ 0);
- if (!g_isHeaderAvailable)
+ if (!remoteEndpoint)
{
- totalDataLen = CAParseHeader((char*)message->data);
- if (0 == totalDataLen)
- {
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "totalDataLen is zero");
- return;
- }
-
- OIC_LOG_V(DEBUG, EDR_ADAPTER_TAG, "Total data to be accumulated [%d] bytes", totalDataLen);
-
- defragData = (char *) OICMalloc(sizeof(char) * totalDataLen);
- if (!defragData)
- {
- OIC_LOG(ERROR, EDR_ADAPTER_TAG, "defragData is null");
- return;
- }
+ OIC_LOG(ERROR, EDR_ADAPTER_TAG, "remoteEndpoint is NULL");
+ return;
+ }
- const char *remoteAddress = message->remoteEndpoint->addressInfo.BT.btMacAddress;
- const char *serviceUUID = message->remoteEndpoint->resourceUri;
+ OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Sending data up !");
- remoteEndpoint = CAAdapterCreateRemoteEndpoint(CA_EDR, remoteAddress, serviceUUID);
+ const CASecureEndpoint_t sep = { .endpoint = *remoteEndpoint };
- memcpy(defragData + recvDataLen, message->data + CA_HEADER_LENGTH,
- message->dataLen - CA_HEADER_LENGTH);
- recvDataLen += message->dataLen - CA_HEADER_LENGTH;
- g_isHeaderAvailable = true;
- }
- else
- {
- memcpy(defragData + recvDataLen, message->data, message->dataLen);
- recvDataLen += message->dataLen ;
- }
+ g_networkPacketReceivedCallback(&sep, message->data, message->dataLen);
- if (totalDataLen == recvDataLen)
- {
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "Sending data up !");
- g_networkPacketReceivedCallback(remoteEndpoint, defragData, recvDataLen);
- recvDataLen = 0;
- totalDataLen = 0;
- remoteEndpoint = NULL;
- g_isHeaderAvailable = false;
- }
+ CAFreeEndpoint(remoteEndpoint);
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT_CAAdapterDataReceiverHandler");
}
CAResult_t CAAdapterStartQueue()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
// Start send queue thread
if (CA_STATUS_OK != CAQueueingThreadStart(g_sendQueueHandle))
{
CAEDRClientDisconnectAll();
return CA_STATUS_FAILED;
}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
+
return CA_STATUS_OK;
}
CAResult_t CAAdapterStopQueue()
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
//Stop send queue thread
CAQueueingThreadStop(g_sendQueueHandle);
//Stop receive queue thread
CAQueueingThreadStop(g_recvQueueHandle);
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
+
return CA_STATUS_OK;
}
-void CAAdapterRecvData(const char *remoteAddress, const void *data, uint32_t dataLength,
+void CAAdapterRecvData(const char *remoteAddress, const uint8_t *data, uint32_t dataLength,
uint32_t *sentLength)
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
if (false == g_adapterState)
{
OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Bluetooth adapter is disabled!");
VERIFY_NON_NULL_VOID(data, EDR_ADAPTER_TAG, "Data is null");
VERIFY_NON_NULL_VOID(sentLength, EDR_ADAPTER_TAG, "Sent data length holder is null");
- static const char serviceUUID[] = OIC_EDR_SERVICE_ID;
// Create remote endpoint
- CARemoteEndpoint_t *remoteEndpoint = CAAdapterCreateRemoteEndpoint(CA_EDR, remoteAddress,
- serviceUUID);
+ CAEndpoint_t *remoteEndpoint = CACreateEndpointObject(CA_DEFAULT_FLAGS,
+ CA_ADAPTER_RFCOMM_BTEDR,
+ remoteAddress, 0);
if (NULL == remoteEndpoint)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to create remote endpoint !");
*sentLength = dataLength;
// Free remote endpoint
- CAAdapterFreeRemoteEndpoint(remoteEndpoint);
+ CAFreeEndpoint(remoteEndpoint);
+}
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
+void CAEDRErrorHandler(const char *remoteAddress, const uint8_t *data,
+ uint32_t dataLength, CAResult_t result)
+{
+ // Input validation
+ VERIFY_NON_NULL_VOID(data, EDR_ADAPTER_TAG, "Data is null");
+
+ // Create remote endpoint
+ CAEndpoint_t *remoteEndpoint = CACreateEndpointObject(0, CA_ADAPTER_RFCOMM_BTEDR,
+ remoteAddress, 0);
+ if (!remoteEndpoint)
+ {
+ OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to create remote endpoint !");
+ return;
+ }
+
+ g_errorCallback(remoteEndpoint, data, dataLength, result);
+
+ // Free remote endpoint
+ CAFreeEndpoint(remoteEndpoint);
}
-CAResult_t CAAdapterSendData(const char *remoteAddress, const char *serviceUUID, const void *data,
+CAResult_t CAAdapterSendData(const char *remoteAddress, const char *serviceUUID, const uint8_t *data,
uint32_t dataLength, uint32_t *sentLength)
{
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN - CAAdapterSendData");
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Bluetooth adapter is disabled!");
*sentLength = 0;
- return CA_STATUS_OK;
+ return CA_ADAPTER_NOT_ENABLED;
}
// Input validation
VERIFY_NON_NULL(serviceUUID, EDR_ADAPTER_TAG, "service UUID is null");
VERIFY_NON_NULL(sentLength, EDR_ADAPTER_TAG, "Sent data length holder is null");
// Create remote endpoint
- CARemoteEndpoint_t *remoteEndpoint = CAAdapterCreateRemoteEndpoint(CA_EDR, remoteAddress,
- serviceUUID);
+ CAEndpoint_t *remoteEndpoint = CACreateEndpointObject(CA_DEFAULT_FLAGS,
+ CA_ADAPTER_RFCOMM_BTEDR,
+ remoteAddress, 0);
if (NULL == remoteEndpoint)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to create remote endpoint !");
- return CA_STATUS_FAILED;
+ return CA_MEMORY_ALLOC_FAILED;
}
// Add message to data queue
CAEDRData *edrData = CACreateEDRData(remoteEndpoint, data, dataLength);
- CAQueueingThreadAddData(g_sendQueueHandle, edrData, sizeof(CAEDRData));
+ CAQueueingThreadAddData(g_sendQueueHandle, edrData, sizeof (CAEDRData));
*sentLength = dataLength;
// Free remote endpoint
- CAAdapterFreeRemoteEndpoint(remoteEndpoint);
+ CAFreeEndpoint(remoteEndpoint);
OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT - CAAdapterSendData");
return CA_STATUS_OK;
void CAEDRNotifyNetworkStatus(CANetworkStatus_t status)
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
// Create localconnectivity
if (NULL == g_localConnectivity)
{
return;
}
- if (false== adapterState)
+ if (false == adapterState)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Bluetooth adapter is disabled!");
g_adapterState = false;
}
}
}
-
- OIC_LOG_V(DEBUG, EDR_ADAPTER_TAG, "OUT");
}
void CAEDROnNetworkStatusChanged(void *context)
{
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN");
-
if (NULL == context)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "context is NULL!");
// Free the created Network event
CAEDRFreeNetworkEvent(networkEvent);
-
- OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT");
}
-CAEDRNetworkEvent *CAEDRCreateNetworkEvent(CALocalConnectivity_t *connectivity,
+CAEDRNetworkEvent *CAEDRCreateNetworkEvent(CAEndpoint_t *connectivity,
CANetworkStatus_t status)
{
VERIFY_NON_NULL_RET(connectivity, EDR_ADAPTER_TAG, "connectivity is NULL", NULL);
}
// Create duplicate of Local connectivity
- event->info = CAAdapterCopyLocalEndpoint(connectivity);
+ event->info = CACloneEndpoint(connectivity);
event->status = status;
return event;
}
{
if (event)
{
- CAAdapterFreeLocalEndpoint(event->info);
+ CAFreeEndpoint(event->info);
OICFree(event);
}
}
-CAEDRData *CACreateEDRData(const CARemoteEndpoint_t *remoteEndpoint, const void *data,
- uint32_t dataLength)
+CAEDRData *CACreateEDRData(const CAEndpoint_t *remoteEndpoint,
+ const uint8_t *data, uint32_t dataLength)
{
- CAEDRData *edrData = (CAEDRData *) OICMalloc(sizeof(CAEDRData));
+ CAEDRData *edrData = (CAEDRData *) OICCalloc(1, sizeof(*edrData));
if (!edrData)
{
OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Memory allocation failed!");
return NULL;
}
- edrData->remoteEndpoint = CAAdapterCopyRemoteEndpoint(remoteEndpoint);
+ edrData->remoteEndpoint = CACloneEndpoint(remoteEndpoint);
+
edrData->data = OICMalloc(dataLength);
if (NULL == edrData->data)
{
{
VERIFY_NON_NULL_VOID(edrData, EDR_ADAPTER_TAG, "edrData is NULL");
- CAAdapterFreeRemoteEndpoint(edrData->remoteEndpoint);
+ CAFreeEndpoint(edrData->remoteEndpoint);
OICFree(edrData->data);
OICFree(edrData);
}
void CAEDRDataDestroyer(void *data, uint32_t size)
{
+ if ((size_t)size < sizeof(CAEDRData))
+ {
+ OIC_LOG_V(ERROR, EDR_ADAPTER_TAG, "Destroy data too small %p %d", data, size);
+ }
CAEDRData *edrdata = (CAEDRData *) data;
CAFreeEDRData(edrdata);
}
-
projects / platform / upstream / iotivity.git / blobdiff