#endif
#include "camutex.h"
#include "uarraylist.h"
+#include "caremotehandler.h"
#include "logger.h"
#include "oic_malloc.h"
+#include "oic_string.h"
/**
- * @def IP_ADAPTER_TAG
+ * @def TAG
* @brief Logging tag for module name
*/
-#define IP_ADAPTER_TAG "IP_ADAP"
-
-/**
- * @def CA_PORT
- * @brief Port to listen for incoming data
- */
-#define CA_PORT 6298
-
-/**
- * @def CA_SECURE_PORT
- * @brief Secured (unicast) port number as defined in COAP Specification, RFC-7252.
- */
-#define CA_SECURE_PORT 5684
-
-/**
- * @def CA_MCAST_PORT
- * @brief Multicast port number as defined in COAP Specification, RFC-7252.
- */
-#define CA_MCAST_PORT 5683
-
-/**
- * @def CA_MULTICAST_IP
- * @brief Multicast IP Address as defined in COAP Specification, RFC-7252.
- */
-#define CA_MULTICAST_IP "224.0.1.187"
+#define TAG "IP_ADAP"
+#ifndef SINGLE_THREAD
/**
* @var CAIPData
* @brief Holds inter thread ip data information.
*/
typedef struct
{
- CARemoteEndpoint_t *remoteEndpoint;
+ CAEndpoint_t *remoteEndpoint;
void *data;
uint32_t dataLen;
+ bool isMulticast;
} CAIPData;
/**
+ * @var g_sendQueueHandle
+ * @brief Queue handle for Send Data
+ */
+static CAQueueingThread_t *g_sendQueueHandle = NULL;
+#endif
+
+/**
* @var g_networkPacketCallback
* @brief Network Packet Received Callback to CA
*/
static CANetworkChangeCallback g_networkChangeCallback = NULL;
/**
- * @var g_sendQueueHandle
- * @brief Queue handle for Send Data
+ * @var g_errorCallback
+ * @brief error Callback to CA adapter
*/
-static CAQueueingThread_t *g_sendQueueHandle = NULL;
+static CAErrorHandleCallback g_errorCallback = NULL;
-/**
- * @var g_threadPool
- * @brief ThreadPool for storing ca_thread_pool_t handle passed from CA
- */
-static ca_thread_pool_t g_threadPool = NULL;
+static void CAIPPacketReceivedCB(const CAEndpoint_t *endpoint,
+ const void *data, uint32_t dataLength);
+#ifdef __WITH_DTLS__
+static void CAIPPacketSendCB(CAEndpoint_t *endpoint,
+ const void *data, uint32_t dataLength);
+#endif
+
+#ifndef SINGLE_THREAD
static CAResult_t CAIPInitializeQueueHandles();
static void CAIPDeinitializeQueueHandles();
-static void CAIPNotifyNetworkChange(const char *address, uint16_t port,
- CANetworkStatus_t status);
-
-static void CAIPConnectionStateCB(const char *ipAddress, CANetworkStatus_t status);
-
-static void CAIPPacketReceivedCB(const char *ipAddress, uint16_t port, const void *data,
- uint32_t dataLength, bool isSecured);
-#ifdef __WITH_DTLS__
-static uint32_t CAIPPacketSendCB(const char *ipAddress, uint16_t port,
- const void *data, uint32_t dataLength);
-#endif
-
-static CAResult_t CAIPStopServers();
-
static void CAIPSendDataThread(void *threadData);
-static CAIPData *CACreateIPData(const CARemoteEndpoint_t *remoteEndpoint,
- const void *data, uint32_t dataLength);
+static CAIPData *CACreateIPData(const CAEndpoint_t *remoteEndpoint,
+ const void *data, uint32_t dataLength,
+ bool isMulticast);
void CAFreeIPData(CAIPData *ipData);
static void CADataDestroyer(void *data, uint32_t size);
CAResult_t CAIPInitializeQueueHandles()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
// Check if the message queue is already initialized
if (g_sendQueueHandle)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "send queue handle is already initialized!");
+ OIC_LOG(DEBUG, TAG, "send queue handle is already initialized!");
return CA_STATUS_OK;
}
g_sendQueueHandle = OICMalloc(sizeof(CAQueueingThread_t));
if (!g_sendQueueHandle)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Memory allocation failed!");
+ OIC_LOG(ERROR, TAG, "Memory allocation failed!");
return CA_MEMORY_ALLOC_FAILED;
}
- if (CA_STATUS_OK != CAQueueingThreadInitialize(g_sendQueueHandle, g_threadPool,
- CAIPSendDataThread, CADataDestroyer))
+ if (CA_STATUS_OK != CAQueueingThreadInitialize(g_sendQueueHandle,
+ (const ca_thread_pool_t)caglobals.ip.threadpool,
+ CAIPSendDataThread, CADataDestroyer))
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Failed to Initialize send queue thread");
+ OIC_LOG(ERROR, TAG, "Failed to Initialize send queue thread");
OICFree(g_sendQueueHandle);
g_sendQueueHandle = NULL;
return CA_STATUS_FAILED;
}
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
return CA_STATUS_OK;
}
void CAIPDeinitializeQueueHandles()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
CAQueueingThreadDestroy(g_sendQueueHandle);
OICFree(g_sendQueueHandle);
g_sendQueueHandle = NULL;
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
}
-void CAIPNotifyNetworkChange(const char *address, uint16_t port, CANetworkStatus_t status)
-{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- VERIFY_NON_NULL_VOID(address, IP_ADAPTER_TAG, "address is NULL");
+#endif // SINGLE_THREAD
- CALocalConnectivity_t *localEndpoint = CAAdapterCreateLocalEndpoint(CA_IPV4, address);
- if (!localEndpoint)
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "localEndpoint creation failed!");
- return;
- }
+void CAIPConnectionStateCB(const char *ipAddress, CANetworkStatus_t status)
+{
+ OIC_LOG(DEBUG, TAG, "IN");
+}
- localEndpoint->addressInfo.IP.port = port;
+#ifdef __WITH_DTLS__
+static void CAIPPacketSendCB(CAEndpoint_t *endpoint, const void *data, uint32_t dataLength)
+{
+ OIC_LOG(DEBUG, TAG, "IN");
- if (g_networkChangeCallback)
- {
- g_networkChangeCallback(localEndpoint, status);
- }
- else
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "g_networkChangeCallback is NULL");
- }
+ VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint is NULL");
+ VERIFY_NON_NULL_VOID(data, TAG, "data is NULL");
- CAAdapterFreeLocalEndpoint(localEndpoint);
+ CAIPSendData(endpoint, data, dataLength, false);
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
}
+#endif
-void CAIPConnectionStateCB(const char *ipAddress, CANetworkStatus_t status)
+void CAIPPacketReceivedCB(const CAEndpoint_t *endpoint, const void *data,
+ uint32_t dataLength)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
- VERIFY_NON_NULL_VOID(ipAddress, IP_ADAPTER_TAG, "ipAddress is NULL");
+ VERIFY_NON_NULL_VOID(endpoint, TAG, "ipAddress is NULL");
+ VERIFY_NON_NULL_VOID(data, TAG, "data is NULL");
- if (CA_INTERFACE_UP == status)
- {
- uint16_t port = CA_PORT;
- CAResult_t ret = CAIPStartUnicastServer(ipAddress, &port, false, false);
- if (CA_STATUS_OK == ret)
- {
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Unicast server started on %d port", port);
- }
- else
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to start Unicast server port[%d]", ret);
- }
+ OIC_LOG_V(DEBUG, TAG, "Address: %s, port:%d", endpoint->addr, endpoint->port);
-#ifdef __WITH_DTLS__
- port = CA_SECURE_PORT;
- ret = CAIPStartUnicastServer(ipAddress, &port, false, true);
- if (CA_STATUS_OK == ret)
- {
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Secure Unicast server started on %d", port);
- }
- else
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to start secure Unicast server [%d]",
- ret);
- }
-#endif
- ret = CAIPStartMulticastServer(ipAddress, CA_MULTICAST_IP, CA_MCAST_PORT);
- if (CA_STATUS_OK == ret)
- {
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Multicast server started on port[%d]",
- CA_MCAST_PORT);
- }
- else
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to start Multicast server port[%d]",
- ret);
- }
+ void *buf = OICCalloc(dataLength + 1, sizeof (char));
+ if (!buf)
+ {
+ OIC_LOG(ERROR, TAG, "Memory Allocation failed!");
+ return;
+ }
+ memcpy(buf, data, dataLength);
- // Notify network change to CA
- CAIPNotifyNetworkChange(ipAddress, port, status);
+ if (g_networkPacketCallback)
+ {
+ g_networkPacketCallback(endpoint, buf, dataLength);
}
else
{
- CAIPNotifyNetworkChange(ipAddress, 0, status);
-
- // Stop Unicast, Secured unicast and Multicast servers
- CAIPStopServer(ipAddress);
+ OICFree(buf);
}
-
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
-}
-
-#ifdef __WITH_DTLS__
-uint32_t CAIPPacketSendCB(const char *ipAddress, uint16_t port,
- const void *data, uint32_t dataLength)
-{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- VERIFY_NON_NULL_RET(ipAddress, IP_ADAPTER_TAG, "ipAddress is NULL", 0);
-
- VERIFY_NON_NULL_RET(data, IP_ADAPTER_TAG, "data is NULL", 0);
-
- uint32_t sentLength = CAIPSendData(ipAddress, port, data, dataLength, false, true);
-
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Successfully sent %d of encrypted data!", sentLength);
-
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
-
- return sentLength;
+ OIC_LOG(DEBUG, TAG, "OUT");
}
-#endif
-void CAIPPacketReceivedCB(const char *ipAddress, uint16_t port, const void *data,
- uint32_t dataLength, bool isSecured)
+void CAIPErrorHandler (const CAEndpoint_t *endpoint, const void *data,
+ uint32_t dataLength, CAResult_t result)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- VERIFY_NON_NULL_VOID(ipAddress, IP_ADAPTER_TAG, "ipAddress is NULL");
+ OIC_LOG(DEBUG, TAG, "IN");
- VERIFY_NON_NULL_VOID(data, IP_ADAPTER_TAG, "data is NULL");
+ VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint is NULL");
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Address: %s, port:%d", ipAddress, port);
-
- // CA is freeing this memory
- CARemoteEndpoint_t *endPoint = CAAdapterCreateRemoteEndpoint(CA_IPV4, ipAddress, NULL );
- if (!endPoint)
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "EndPoint creation failed!");
- return;
- }
- endPoint->addressInfo.IP.port = port;
- endPoint->isSecured = isSecured;
+ VERIFY_NON_NULL_VOID(data, TAG, "data is NULL");
- void *buf = OICCalloc(dataLength + 1, sizeof(char));
+ void *buf = (void*)OICMalloc(sizeof(char) * dataLength);
if (!buf)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Memory Allocation failed!");
- CAAdapterFreeRemoteEndpoint(endPoint);
+ OIC_LOG(ERROR, TAG, "Memory Allocation failed!");
return;
}
memcpy(buf, data, dataLength);
- if (g_networkPacketCallback)
+ if (g_errorCallback)
{
- g_networkPacketCallback(endPoint, buf, dataLength);
+ g_errorCallback(endpoint, buf, dataLength, result);
}
else
{
OICFree(buf);
- CAAdapterFreeRemoteEndpoint(endPoint);
}
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
+}
+
+static void CAInitializeIPGlobals()
+{
+ caglobals.ip.u6.fd = -1;
+ caglobals.ip.u6s.fd = -1;
+ caglobals.ip.u4.fd = -1;
+ caglobals.ip.u4s.fd = -1;
+ caglobals.ip.m6.fd = -1;
+ caglobals.ip.m6s.fd = -1;
+ caglobals.ip.m4.fd = -1;
+ caglobals.ip.m4s.fd = -1;
+ caglobals.ip.u6.port = 0;
+ caglobals.ip.u6s.port = 0;
+ caglobals.ip.u4.port = 0;
+ caglobals.ip.u4s.port = 0;
+ caglobals.ip.m6.port = CA_COAP;
+ caglobals.ip.m6s.port = CA_SECURE_COAP;
+ caglobals.ip.m4.port = CA_COAP;
+ caglobals.ip.m4s.port = CA_SECURE_COAP;
+
+ CATransportFlags_t flags = 0;
+ if (caglobals.client)
+ {
+ flags |= caglobals.clientFlags;
+ }
+ if (caglobals.server)
+ {
+ flags |= caglobals.serverFlags;
+ }
+ caglobals.ip.ipv6enabled = flags & CA_IPV6;
+ caglobals.ip.ipv4enabled = flags & CA_IPV4;
}
CAResult_t CAInitializeIP(CARegisterConnectivityCallback registerCallback,
- CANetworkPacketReceivedCallback networkPacketCallback,
- CANetworkChangeCallback netCallback, ca_thread_pool_t handle)
+ CANetworkPacketReceivedCallback networkPacketCallback,
+ CANetworkChangeCallback netCallback,
+ CAErrorHandleCallback errorCallback, ca_thread_pool_t handle)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
- VERIFY_NON_NULL(registerCallback, IP_ADAPTER_TAG, "registerCallback");
- VERIFY_NON_NULL(networkPacketCallback, IP_ADAPTER_TAG, "networkPacketCallback");
- VERIFY_NON_NULL(netCallback, IP_ADAPTER_TAG, "netCallback");
- VERIFY_NON_NULL(handle, IP_ADAPTER_TAG, "thread pool handle");
+ OIC_LOG(DEBUG, TAG, "IN");
+ VERIFY_NON_NULL(registerCallback, TAG, "registerCallback");
+ VERIFY_NON_NULL(networkPacketCallback, TAG, "networkPacketCallback");
+ VERIFY_NON_NULL(netCallback, TAG, "netCallback");
+#ifndef SINGLE_THREAD
+ VERIFY_NON_NULL(handle, TAG, "thread pool handle");
+#endif
- g_threadPool = handle;
g_networkChangeCallback = netCallback;
g_networkPacketCallback = networkPacketCallback;
+ g_errorCallback = errorCallback;
- CAResult_t ret = CAIPInitializeNetworkMonitor(g_threadPool);
- if (CA_STATUS_OK != ret)
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to initialize n/w monitor![%d]", ret);
- return ret;
- }
- CAIPSetConnectionStateChangeCallback(CAIPConnectionStateCB);
-
- ret = CAIPInitializeServer(g_threadPool);
- if (CA_STATUS_OK != ret)
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to initialize server![%d]", ret);
- CATerminateIP();
- return ret;
- }
+ CAInitializeIPGlobals();
+ caglobals.ip.threadpool = handle;
CAIPSetPacketReceiveCallback(CAIPPacketReceivedCB);
#ifdef __WITH_DTLS__
CAAdapterNetDtlsInit();
- CADTLSSetAdapterCallbacks(CAIPPacketReceivedCB, CAIPPacketSendCB, DTLS_IP);
+ CADTLSSetAdapterCallbacks(CAIPPacketReceivedCB, CAIPPacketSendCB, 0);
#endif
CAConnectivityHandler_t ipHandler;
ipHandler.readData = CAReadIPData;
ipHandler.stopAdapter = CAStopIP;
ipHandler.terminate = CATerminateIP;
- registerCallback(ipHandler, CA_IPV4);
-
- if (CA_STATUS_OK != CAIPInitializeQueueHandles())
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Failed to Initialize Queue Handle");
- CATerminateIP();
- return CA_STATUS_FAILED;
- }
+ registerCallback(ipHandler, CA_ADAPTER_IP);
- OIC_LOG(INFO, IP_ADAPTER_TAG, "OUT IntializeIP is Success");
+ OIC_LOG(INFO, TAG, "OUT IntializeIP is Success");
return CA_STATUS_OK;
}
CAResult_t CAStartIP()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
- // Start monitoring IP network
- CAResult_t ret = CAIPStartNetworkMonitor();
+#ifdef SINGLE_THREAD
+ uint16_t unicastPort = 55555;
+ // Address is hardcoded as we are using Single Interface
+ CAResult_t ret = CAIPStartServer();
if (CA_STATUS_OK != ret)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Failed to Start n/w monitor");
+ OIC_LOG_V(DEBUG, TAG, "CAIPStartServer failed[%d]", ret);
return ret;
}
-
- // Start send queue thread
- if (CA_STATUS_OK != CAQueueingThreadStart(g_sendQueueHandle))
+#else
+ if (CA_STATUS_OK != CAIPInitializeQueueHandles())
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Failed to Start Send Data Thread");
+ OIC_LOG(ERROR, TAG, "Failed to Initialize Queue Handle");
+ CATerminateIP();
return CA_STATUS_FAILED;
}
- bool retVal = CAIPIsConnected();
- if (false == retVal)
+ // Start send queue thread
+ if (CA_STATUS_OK != CAQueueingThreadStart(g_sendQueueHandle))
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IP is not Connected");
- return CA_STATUS_OK;
+ OIC_LOG(ERROR, TAG, "Failed to Start Send Data Thread");
+ return CA_STATUS_FAILED;
}
- u_arraylist_t *netInterfaceList = u_arraylist_create();
-
- VERIFY_NON_NULL(netInterfaceList, IP_ADAPTER_TAG, "netInterfaceList is NULL");
-
- ret = CAIPGetInterfaceInfo(&netInterfaceList);
+ CAResult_t ret = CAIPStartServer((const ca_thread_pool_t)caglobals.ip.threadpool);
if (CA_STATUS_OK != ret)
{
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to get IP interface info [%d]", ret);
- CAClearNetInterfaceInfoList(netInterfaceList);
+ OIC_LOG_V(ERROR, TAG, "Failed to start server![%d]", ret);
return ret;
}
- uint32_t listIndex = 0;
- uint32_t listLength = u_arraylist_length(netInterfaceList);
- for (listIndex = 0; listIndex < listLength; listIndex++)
- {
- CANetInfo_t *netInfo = (CANetInfo_t *) u_arraylist_get(netInterfaceList, listIndex);
- if (!netInfo)
- {
- continue;
- }
- uint16_t unicastPort = CA_PORT;
- ret = CAIPStartUnicastServer(netInfo->ipAddress, &unicastPort, false, false);
- if (CA_STATUS_OK == ret)
- {
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Unicast server started on %d port",
- unicastPort);
- }
-
-#ifdef __WITH_DTLS__
- unicastPort = CA_SECURE_PORT;
- ret = CAIPStartUnicastServer(netInfo->ipAddress, &unicastPort, false, true);
-
- if (CA_STATUS_OK == ret)
- {
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG,
- "Secure Unicast server started on %d port", unicastPort);
- }
#endif
- }
- CAClearNetInterfaceInfoList(netInterfaceList);
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
- return ret;
+
+ OIC_LOG(DEBUG, TAG, "OUT");
+ return CA_STATUS_OK;
}
CAResult_t CAStartIPListeningServer()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- bool retVal = CAIPIsConnected();
- if (false == retVal)
- {
- OIC_LOG(DEBUG, IP_ADAPTER_TAG,
- "IP not Connected. Couldn't start multicast server");
- return CA_STATUS_OK;
- }
-
- u_arraylist_t *netInterfaceList = u_arraylist_create();
-
- VERIFY_NON_NULL(netInterfaceList, IP_ADAPTER_TAG, "netInterfaceList is NULL");
-
- CAResult_t ret = CAIPGetInterfaceInfo(&netInterfaceList);
- if (CA_STATUS_OK != ret)
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "Failed to get IP interface info [%d]", ret);
- CAClearNetInterfaceInfoList(netInterfaceList);
- return ret;
- }
-
- uint32_t listIndex = 0;
- uint32_t listLength = u_arraylist_length(netInterfaceList);
- for (listIndex = 0; listIndex < listLength; listIndex++)
- {
-
- CANetInfo_t *netInfo = (CANetInfo_t *) u_arraylist_get(netInterfaceList, listIndex);
- if (!netInfo)
- {
- continue;
- }
-
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG, "Ip address for multicast interface %s",
- netInfo->ipAddress);
- ret = CAIPStartMulticastServer(netInfo->ipAddress, CA_MULTICAST_IP, CA_MCAST_PORT);
- if (CA_STATUS_OK == ret)
- {
- OIC_LOG(INFO, IP_ADAPTER_TAG, "Multicast Server is Started Successfully");
- }
- }
+ OIC_LOG(DEBUG, TAG, "IN");
- CAClearNetInterfaceInfoList(netInterfaceList);
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
- return ret;
+ OIC_LOG(DEBUG, TAG, "OUT");
+ return CA_STATUS_OK;
}
CAResult_t CAStartIPDiscoveryServer()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
return CAStartIPListeningServer();
}
-int32_t CASendIPUnicastData(const CARemoteEndpoint_t *remoteEndpoint, const void *data,
- uint32_t dataLength)
+static int32_t CAQueueIPData(bool isMulticast, const CAEndpoint_t *endpoint,
+ const void *data, uint32_t dataLength)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
- VERIFY_NON_NULL_RET(remoteEndpoint, IP_ADAPTER_TAG, "remoteEndpoint", -1);
- VERIFY_NON_NULL_RET(data, IP_ADAPTER_TAG, "data", -1);
- VERIFY_NON_NULL_RET(g_sendQueueHandle, IP_ADAPTER_TAG, "sendQueueHandle", -1);
+ VERIFY_NON_NULL_RET(endpoint, TAG, "remoteEndpoint", -1);
+ VERIFY_NON_NULL_RET(data, TAG, "data", -1);
if (0 == dataLength)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Invalid Data Length");
- return -1;
- }
-
- // Create IPData to add to queue
- CAIPData *ipData = CACreateIPData(remoteEndpoint, data, dataLength);
- if (!ipData)
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Failed to create ipData!");
+ OIC_LOG(ERROR, TAG, "Invalid Data Length");
return -1;
}
- else
- {
- // Add message to send queue
- CAQueueingThreadAddData(g_sendQueueHandle, ipData, sizeof(CAIPData));
-
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
- return dataLength;
- }
-}
-int32_t CASendIPMulticastData(const void *data, uint32_t dataLength)
-{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+#ifdef SINGLE_THREAD
- VERIFY_NON_NULL_RET(data, IP_ADAPTER_TAG, "data", -1);
- VERIFY_NON_NULL_RET(g_sendQueueHandle, IP_ADAPTER_TAG, "sendQueueHandle", -1);
+ CAIPSendData(endpoint, data, dataLength, isMulticast);
- if (0 == dataLength)
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Invalid Data Length");
- return -1;
- }
+#else
+ VERIFY_NON_NULL_RET(g_sendQueueHandle, TAG, "sendQueueHandle", -1);
// Create IPData to add to queue
- CAIPData *ipData = CACreateIPData(NULL, data, dataLength);
+ CAIPData *ipData = CACreateIPData(endpoint, data, dataLength, isMulticast);
if (!ipData)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Failed to create ipData!");
+ OIC_LOG(ERROR, TAG, "Failed to create ipData!");
return -1;
}
- else
- {
- // Add message to send queue
- CAQueueingThreadAddData(g_sendQueueHandle, ipData, sizeof(CAIPData));
+ // Add message to send queue
+ CAQueueingThreadAddData(g_sendQueueHandle, ipData, sizeof(CAIPData));
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
- return dataLength;
- }
+ OIC_LOG(DEBUG, TAG, "OUT");
+ return dataLength;
+
+#endif // SINGLE_THREAD
}
-CAResult_t CAGetIPInterfaceInformation(CALocalConnectivity_t **info, uint32_t *size)
+int32_t CASendIPUnicastData(const CAEndpoint_t *endpoint,
+ const void *data, uint32_t dataLength)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- VERIFY_NON_NULL(info, IP_ADAPTER_TAG, "info is NULL");
- VERIFY_NON_NULL(size, IP_ADAPTER_TAG, "size is NULL");
-
- bool retVal = CAIPIsConnected();
- if (false == retVal)
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG,
- "Failed to get interface address, IP not Connected");
- return CA_ADAPTER_NOT_ENABLED;
- }
-
- u_arraylist_t *netInterfaceList = u_arraylist_create();
-
- VERIFY_NON_NULL(netInterfaceList, IP_ADAPTER_TAG, "netInterfaceList is NULL");
-
- CAResult_t ret = CAIPGetInterfaceInfo(&netInterfaceList);
- if (CA_STATUS_OK != ret)
- {
- OIC_LOG_V(ERROR, IP_ADAPTER_TAG, "CAIPGetInterfaceInfo failed:%d", ret);
- CAClearNetInterfaceInfoList(netInterfaceList);
- return ret;
- }
-
- uint32_t listLength = u_arraylist_length(netInterfaceList);
- uint32_t netInfoSize = listLength;
-
-#ifdef __WITH_DTLS__
- if (listLength)
- {
- netInfoSize = listLength * 2;
- }
-#endif
-
- CALocalConnectivity_t *conInfo = (CALocalConnectivity_t *) OICCalloc(
- netInfoSize, sizeof(CALocalConnectivity_t));
- if (!conInfo)
- {
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Malloc Failed");
- CAClearNetInterfaceInfoList(netInterfaceList);
- return CA_MEMORY_ALLOC_FAILED;
- }
-
- uint32_t listIndex = 0;
- uint32_t count = 0;
- for (listIndex = 0; listIndex < listLength; listIndex++)
- {
- CANetInfo_t *netInfo = (CANetInfo_t *) u_arraylist_get(netInterfaceList, listIndex);
- if (!netInfo)
- {
- continue;
- }
-
- conInfo[count].type = CA_IPV4;
- conInfo[count].isSecured = false;
- conInfo[count].addressInfo.IP.port = CAGetServerPortNum(netInfo->ipAddress, false);
- strncpy(conInfo[count].addressInfo.IP.ipAddress, netInfo->ipAddress,
- strlen(netInfo->ipAddress));
-
-#ifdef __WITH_DTLS__
- // copy secure unicast server information
- {
- count ++;
- conInfo[count].type = CA_IPV4;
- conInfo[count].isSecured = true;
- conInfo[count].addressInfo.IP.port = CAGetServerPortNum(netInfo->ipAddress, true);
- strncpy(conInfo[count].addressInfo.IP.ipAddress, netInfo->ipAddress,
- strlen(netInfo->ipAddress));
- }
-#endif
- count ++;
- }
- *size = count;
- *info = conInfo;
- CAClearNetInterfaceInfoList(netInterfaceList);
-
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
- return CA_STATUS_OK;
+ OIC_LOG(DEBUG, TAG, "IN");
+ return CAQueueIPData(false, endpoint, data, dataLength);
}
-CAResult_t CAReadIPData()
+int32_t CASendIPMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
- return CA_STATUS_OK;
+ OIC_LOG(DEBUG, TAG, "IN");
+ return CAQueueIPData(true, endpoint, data, dataLength);
}
-CAResult_t CAIPStopServers()
+CAResult_t CAReadIPData()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- // Stop all unicast and multicast servers.
- if (CA_STATUS_OK == CAIPStopAllServers())
- {
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "CAIPStopAllServers success");
- }
-
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "IN");
+ CAIPPullData();
+ OIC_LOG(DEBUG, TAG, "OUT");
return CA_STATUS_OK;
}
CAResult_t CAStopIP()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
#ifdef __WITH_DTLS__
CAAdapterNetDtlsDeInit();
#endif
- // Stop IP network monitor
- CAIPStopNetworkMonitor();
-
- // Stop send queue thread
- if (g_sendQueueHandle)
+#ifndef SINGLE_THREAD
+ if (g_sendQueueHandle && g_sendQueueHandle->threadMutex)
{
CAQueueingThreadStop(g_sendQueueHandle);
}
- // Stop Unicast, Secured unicast and Multicast servers running
- CAIPStopServers();
+ CAIPDeinitializeQueueHandles();
+#endif
+
+ CAIPStopServer();
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
return CA_STATUS_OK;
}
void CATerminateIP()
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
-
- // Stop IP adapter
- CAStopIP();
+ OIC_LOG(DEBUG, TAG, "IN");
#ifdef __WITH_DTLS__
- CADTLSSetAdapterCallbacks(NULL, NULL, DTLS_IP);
+ CADTLSSetAdapterCallbacks(NULL, NULL, 0);
#endif
CAIPSetPacketReceiveCallback(NULL);
- // Terminate IP server
- CAIPTerminateServer();
-
- // Terminate network monitor
- CAIPSetConnectionStateChangeCallback(NULL);
- CAIPTerminateNetworkMonitor();
-
- // Terminate message queue handler
+#ifndef SINGLE_THREAD
CAIPDeinitializeQueueHandles();
+#endif
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
}
+#ifndef SINGLE_THREAD
+
void CAIPSendDataThread(void *threadData)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "IN");
+ OIC_LOG(DEBUG, TAG, "IN");
CAIPData *ipData = (CAIPData *) threadData;
if (!ipData)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "Invalid ip data!");
+ OIC_LOG(DEBUG, TAG, "Invalid ip data!");
return;
}
- //If remoteEndpoint is NULL, its Multicast, else its Unicast.
- if (ipData->remoteEndpoint)
+ if (ipData->isMulticast)
+ {
+ //Processing for sending multicast
+ OIC_LOG(DEBUG, TAG, "Send Multicast Data is called");
+ CAIPSendData(ipData->remoteEndpoint, ipData->data, ipData->dataLen, true);
+ }
+ else
{
//Processing for sending unicast
- char *address = ipData->remoteEndpoint->addressInfo.IP.ipAddress;
- uint16_t port = ipData->remoteEndpoint->addressInfo.IP.port;
-
#ifdef __WITH_DTLS__
- if (!ipData->remoteEndpoint->isSecured)
+ if (ipData->remoteEndpoint->flags & CA_SECURE)
{
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "Send Unicast Data is called");
- CAIPSendData(address, port, ipData->data, ipData->dataLen, false,
- ipData->remoteEndpoint->isSecured);
- }
- else
- {
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "CAAdapterNetDtlsEncrypt called!");
- uint8_t cacheFlag = 0;
- CAResult_t result = CAAdapterNetDtlsEncrypt(address, port, ipData->data,
- ipData->dataLen, &cacheFlag,
- DTLS_IP);
-
+ OIC_LOG(DEBUG, TAG, "CAAdapterNetDtlsEncrypt called!");
+ CAResult_t result = CAAdapterNetDtlsEncrypt(ipData->remoteEndpoint,
+ ipData->data, ipData->dataLen);
if (CA_STATUS_OK != result)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "CAAdapterNetDtlsEncrypt failed!");
+ OIC_LOG(ERROR, TAG, "CAAdapterNetDtlsEncrypt failed!");
}
- OIC_LOG_V(DEBUG, IP_ADAPTER_TAG,
- "CAAdapterNetDtlsEncrypt returned with cache[%d]", cacheFlag);
+ OIC_LOG_V(DEBUG, TAG,
+ "CAAdapterNetDtlsEncrypt returned with result[%d]", result);
+ }
+ else
+ {
+ OIC_LOG(DEBUG, TAG, "Send Unicast Data is called");
+ CAIPSendData(ipData->remoteEndpoint, ipData->data, ipData->dataLen, false);
}
#else
- CAIPSendData(address, port, ipData->data, ipData->dataLen, false,
- ipData->remoteEndpoint->isSecured);
+ CAIPSendData(ipData->remoteEndpoint, ipData->data, ipData->dataLen, false);
#endif
}
- else
- {
- //Processing for sending multicast
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "Send Multicast Data is called");
- CAIPSendData(CA_MULTICAST_IP, CA_MCAST_PORT, ipData->data,
- ipData->dataLen, true, false);
- }
- OIC_LOG(DEBUG, IP_ADAPTER_TAG, "OUT");
+ OIC_LOG(DEBUG, TAG, "OUT");
}
-CAIPData *CACreateIPData(const CARemoteEndpoint_t *remoteEndpoint, const void *data,
- uint32_t dataLength)
+#endif
+
+#ifndef SINGLE_THREAD
+
+CAIPData *CACreateIPData(const CAEndpoint_t *remoteEndpoint, const void *data,
+ uint32_t dataLength, bool isMulticast)
{
- VERIFY_NON_NULL_RET(data, IP_ADAPTER_TAG, "IPData is NULL", NULL);
+ VERIFY_NON_NULL_RET(data, TAG, "IPData is NULL", NULL);
CAIPData *ipData = (CAIPData *) OICMalloc(sizeof(CAIPData));
if (!ipData)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Memory allocation failed!");
+ OIC_LOG(ERROR, TAG, "Memory allocation failed!");
return NULL;
}
- ipData->remoteEndpoint = CAAdapterCopyRemoteEndpoint(remoteEndpoint);
+ ipData->remoteEndpoint = CACloneEndpoint(remoteEndpoint);
ipData->data = (void *) OICMalloc(dataLength);
if (!ipData->data)
{
- OIC_LOG(ERROR, IP_ADAPTER_TAG, "Memory allocation failed!");
+ OIC_LOG(ERROR, TAG, "Memory allocation failed!");
CAFreeIPData(ipData);
return NULL;
}
memcpy(ipData->data, data, dataLength);
ipData->dataLen = dataLength;
+ ipData->isMulticast = isMulticast;
+
return ipData;
}
void CAFreeIPData(CAIPData *ipData)
{
- VERIFY_NON_NULL_VOID(ipData, IP_ADAPTER_TAG, "ipData is NULL");
+ VERIFY_NON_NULL_VOID(ipData, TAG, "ipData is NULL");
- CAAdapterFreeRemoteEndpoint(ipData->remoteEndpoint);
+ CAFreeEndpoint(ipData->remoteEndpoint);
OICFree(ipData->data);
OICFree(ipData);
}
CAFreeIPData(etdata);
}
+#endif // SINGLE_THREAD
+
projects / platform / upstream / iotivity.git / blobdiff