#include "caadapterutils.h"
#include <string.h>
+#include <ctype.h>
#include "oic_malloc.h"
+#include "oic_string.h"
#define CA_ADAPTER_UTILS_TAG "CA_ADAPTER_UTILS"
+void CALogPDUData(coap_pdu_t *pdu)
+{
+ VERIFY_NON_NULL_VOID(pdu, CA_ADAPTER_UTILS_TAG, "pdu");
+ OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "PDU Maker - payload : %s", pdu->data);
+
+ OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "PDU Maker - type : %d", pdu->hdr->type);
+
+ OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "PDU Maker - code : %d", pdu->hdr->code);
+
+ OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "PDU Maker - id : %d", pdu->hdr->id);
+
+ OIC_LOG_V(DEBUG, CA_ADAPTER_UTILS_TAG, "PDU Maker - token : %s", pdu->hdr->token);
+}
+
CALocalConnectivity_t *CAAdapterCreateLocalEndpoint(CAConnectivityType_t type,
- const char *address)
+ const char *address)
{
CALocalConnectivity_t *info = (CALocalConnectivity_t *)
- OICMalloc(sizeof(CALocalConnectivity_t));
+ OICCalloc(1, sizeof(CALocalConnectivity_t));
if (NULL == info)
{
- OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
return NULL;
}
- memset(info, 0, sizeof(CALocalConnectivity_t));
info->type = type;
if (address && strlen(address))
strncpy(info->addressInfo.IP.ipAddress, address, CA_IPADDR_SIZE - 1);
info->addressInfo.IP.ipAddress[CA_IPADDR_SIZE - 1] = '\0';
}
+ else
+ {
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "type is not matched with any transport!");
+ OICFree(info);
+ return NULL;
+ }
}
return info;
}
-CALocalConnectivity_t *CAAdapterCopyLocalEndpoint(CALocalConnectivity_t *connectivity)
+CALocalConnectivity_t *CAAdapterCopyLocalEndpoint(const CALocalConnectivity_t *connectivity)
{
VERIFY_NON_NULL_RET(connectivity, CA_ADAPTER_UTILS_TAG, "connectivity is NULL", NULL);
CALocalConnectivity_t *info = (CALocalConnectivity_t *)
- OICMalloc(sizeof(CALocalConnectivity_t));
+ OICCalloc(1, sizeof(CALocalConnectivity_t));
if (NULL == info)
{
- OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
return NULL;
}
- memset(info, 0, sizeof(CALocalConnectivity_t));
info->type = connectivity->type;
if (CA_EDR == info->type && strlen(connectivity->addressInfo.BT.btMacAddress))
info->addressInfo.IP.ipAddress[CA_IPADDR_SIZE - 1] = '\0';
info->addressInfo.IP.port = connectivity->addressInfo.IP.port;
}
+ else
+ {
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "type is not matched with any transport!");
+ OICFree(info);
+ return NULL;
+ }
info->isSecured = connectivity->isSecured;
return info;
void CAAdapterFreeLocalEndpoint(CALocalConnectivity_t *localEndpoint)
{
- if (localEndpoint)
- {
- OICFree(localEndpoint);
- }
+ OICFree(localEndpoint);
}
CARemoteEndpoint_t *CAAdapterCreateRemoteEndpoint(CAConnectivityType_t type,
- const char *address,
- const char *resourceUri)
+ const char *address,
+ const char *resourceUri)
{
CARemoteEndpoint_t *info = (CARemoteEndpoint_t *)
- OICMalloc(sizeof(CARemoteEndpoint_t));
+ OICCalloc(1, sizeof(CARemoteEndpoint_t));
if (NULL == info)
{
- OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
return NULL;
}
- memset(info, 0, sizeof(CARemoteEndpoint_t));
info->connectivityType = type;
if (address && strlen(address))
strncpy(info->addressInfo.BT.btMacAddress, address, CA_MACADDR_SIZE - 1);
info->addressInfo.BT.btMacAddress[CA_MACADDR_SIZE - 1] = '\0';
}
- else if (CA_LE == info->connectivityType)
+ else if (CA_LE == type)
{
strncpy(info->addressInfo.LE.leMacAddress, address, CA_MACADDR_SIZE - 1);
info->addressInfo.LE.leMacAddress[CA_MACADDR_SIZE - 1] = '\0';
strncpy(info->addressInfo.IP.ipAddress, address, CA_IPADDR_SIZE - 1);
info->addressInfo.IP.ipAddress[CA_IPADDR_SIZE - 1] = '\0';
}
+ else
+ {
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "type is not matched with any transport!");
+ OICFree(info);
+ return NULL;
+ }
}
if (resourceUri && strlen(resourceUri))
VERIFY_NON_NULL_RET(remoteEndpoint, CA_ADAPTER_UTILS_TAG, "Remote endpoint is NULL", NULL);
CARemoteEndpoint_t *info = (CARemoteEndpoint_t *)
- OICMalloc(sizeof(CARemoteEndpoint_t));
+ OICCalloc(1, sizeof(CARemoteEndpoint_t));
if (NULL == info)
{
- OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "Memory allocation failed !");
return NULL;
}
- memset(info, 0, sizeof(CARemoteEndpoint_t));
info->connectivityType = remoteEndpoint->connectivityType;
if (CA_EDR == info->connectivityType && strlen(remoteEndpoint->addressInfo.BT.btMacAddress))
info->addressInfo.IP.ipAddress[CA_IPADDR_SIZE - 1] = '\0';
info->addressInfo.IP.port = remoteEndpoint->addressInfo.IP.port;
}
+ else
+ {
+ OIC_LOG(DEBUG, CA_ADAPTER_UTILS_TAG, "Its not matching. May be multicast.");
+ }
+
+ //For Multicast, remote address will be null while resourceUri will have the service UUID
if (remoteEndpoint->resourceUri && strlen(remoteEndpoint->resourceUri))
{
{
if (remoteEndpoint)
{
- if (remoteEndpoint->resourceUri)
+ OICFree(remoteEndpoint->resourceUri);
+ OICFree(remoteEndpoint);
+ }
+}
+
+CAResult_t CAParseIPv4AddressInternal(const char *ipAddrStr, uint8_t *ipAddr,
+ size_t ipAddrLen, uint16_t *port)
+{
+ if (!ipAddr || !isdigit(ipAddrStr[0]) || !port)
+ {
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "invalid param");
+ return CA_STATUS_INVALID_PARAM;
+ }
+
+ size_t index = 0;
+ uint8_t dotCount = 0;
+
+ ipAddr[index] = 0;
+ *port = 0;
+ while (*ipAddrStr)
+ {
+ if (isdigit(*ipAddrStr))
+ {
+ if(index >= ipAddrLen)
+ {
+ OIC_LOG(ERROR, CA_ADAPTER_UTILS_TAG, "invalid param");
+ return CA_STATUS_INVALID_PARAM;
+ }
+ ipAddr[index] *= 10;
+ ipAddr[index] += *ipAddrStr - '0';
+ }
+ else if (*ipAddrStr == '.')
+ {
+ index++;
+ dotCount++;
+ ipAddr[index] = 0;
+ }
+ else
+ {
+ break;
+ }
+ ipAddrStr++;
+ }
+
+ if (*ipAddrStr == ':')
+ {
+ ipAddrStr++;
+ while (*ipAddrStr)
{
- OICFree(remoteEndpoint->resourceUri);
+ if (isdigit(*ipAddrStr))
+ {
+ *port *= 10;
+ *port += *ipAddrStr - '0';
+ }
+ else
+ {
+ break;
+ }
+ ipAddrStr++;
}
+ }
- OICFree(remoteEndpoint);
+ if (dotCount == 3)
+ {
+ return CA_STATUS_OK;
}
+ return CA_STATUS_FAILED;
}
-bool CAAdapterIsSameSubnet(const char *ipAddress1, const char *ipAddress2,
- const char *netMask)
+bool CAAdapterIsSameSubnet(const char *ipAddress1, const char *ipAddress2, const char *netMask)
{
VERIFY_NON_NULL_RET(ipAddress1, CA_ADAPTER_UTILS_TAG, "First address", false);
VERIFY_NON_NULL_RET(ipAddress2, CA_ADAPTER_UTILS_TAG, "Second address", false);
VERIFY_NON_NULL_RET(netMask, CA_ADAPTER_UTILS_TAG, "netMask", false);
- int32_t ipList1[8] = {0};
- int32_t ipList2[8] = {0};
- int32_t maskList[8] = {0};
- /* IP address check */
- if(!ipAddress1 || !ipAddress2)
- {
- return false;
- }
+ uint8_t ipList1[IPV4_ADDR_ONE_OCTECT_LEN] = { 0 };
+ uint8_t ipList2[IPV4_ADDR_ONE_OCTECT_LEN] = { 0 };
+ uint8_t maskList[IPV4_ADDR_ONE_OCTECT_LEN] = { 0 };
+ CAResult_t ret = CA_STATUS_OK;
/* Local Loopback Address */
- if(0 == strncmp(ipAddress1, "127.", 4)
- || 0 == strncmp(ipAddress2, "127.", 4))
+ if (0 == strncmp(ipAddress1, "127.", 4) || 0 == strncmp(ipAddress2, "127.", 4))
{
return true;
}
- char *ipAdrs1 = strdup(ipAddress1);
- int16_t index = 0;
- int16_t lastDotIndex = 0;
- int16_t ip1TokenCount = 0;
- while('\0' != ipAdrs1[index])
+ uint16_t parsedPort = 0;
+ ret = CAParseIPv4AddressInternal(ipAddress1, ipList1, sizeof(ipList1), &parsedPort);
+ if (ret != CA_STATUS_OK)
{
- if('.' == ipAdrs1[index])
- {
- ipAdrs1[index] = '\0';
- ipList1[ip1TokenCount++] = atoi(ipAdrs1 + lastDotIndex);
- lastDotIndex = index + 1;
- }
- index++;
- }
- // Add last touple
- ipList1[ip1TokenCount] = atoi(ipAdrs1 + lastDotIndex);
-
- char *ipAdrs2 = strdup(ipAddress2);
- index = 0;
- lastDotIndex = 0;
- int16_t ip2TokenCount = 0;
- while('\0' != ipAdrs2[index])
- {
- if('.' == ipAdrs2[index])
- {
- ipAdrs2[index] = '\0';
- ipList2[ip2TokenCount++] = atoi(ipAdrs2 + lastDotIndex);
- lastDotIndex = index + 1;
- }
- index++;
+ OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "First ip address parse fail %d", ret);
+ return false;
}
- // Add last touple
- ipList2[ip2TokenCount] = atoi(ipAdrs2 + lastDotIndex);
-
- char *nMask = strdup(netMask);
- index = 0;
- lastDotIndex = 0;
- int16_t maskTokenCount = 0;
- while('\0' != nMask[index])
+
+ ret = CAParseIPv4AddressInternal(ipAddress2, ipList2, sizeof(ipList2), &parsedPort);
+ if (ret != CA_STATUS_OK)
{
- if('.' == nMask[index])
- {
- nMask[index] = '\0';
- maskList[maskTokenCount++] = atoi(nMask + lastDotIndex);
- lastDotIndex = index + 1;
- }
- index++;
+ OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Second ip address parse fail %d", ret);
+ return false;
}
- // Add last touple
- maskList[maskTokenCount] = atoi(nMask + lastDotIndex);
-
- if(ip1TokenCount < 3 || ip2TokenCount < 3 || maskTokenCount < 3)
- {
- OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Address or mask is invalid!");
- return false;
- }
-
- OICFree(ipAdrs1);
- OICFree(ipAdrs2);
- OICFree(nMask);
-
- if(((ipList1[0]& maskList[0]) == (ipList2[0]& maskList[0]))
- &&((ipList1[1]& maskList[1]) == (ipList2[1]& maskList[1]))
- &&((ipList1[2]& maskList[2]) == (ipList2[2]& maskList[2]))
- &&((ipList1[3]& maskList[3]) == (ipList2[3]& maskList[3])))
+
+ ret = CAParseIPv4AddressInternal(netMask, maskList, sizeof(maskList), &parsedPort);
+ if (ret != CA_STATUS_OK)
{
- return true;
+ OIC_LOG_V(ERROR, CA_ADAPTER_UTILS_TAG, "Net mask parse fail %d", ret);
+ return false;
}
- return false;
-}
\ No newline at end of file
+
+ return ((ipList1[0] & maskList[0]) == (ipList2[0] & maskList[0])) && ((ipList1[1] & maskList[1])
+ == (ipList2[1] & maskList[1]))
+ && ((ipList1[2] & maskList[2]) == (ipList2[2] & maskList[2]))
+ && ((ipList1[3] & maskList[3]) == (ipList2[3] & maskList[3]));
+}
+