#include "logger.h"
#include "rdpayload.h"
-#define TAG "OCPayload"
+#define TAG "OIC_RI_PAYLOAD"
+
static void OCFreeRepPayloadValueContents(OCRepPayloadValue* val);
-static void FreeOCDiscoveryResource(OCResourcePayload* payload);
void OCPayloadDestroy(OCPayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
OCRDPayloadDestroy((OCRDPayload*)payload);
break;
default:
- OC_LOG_V(ERROR, TAG, "Unsupported payload type in destroy: %d", payload->type);
+ OIC_LOG_V(ERROR, TAG, "Unsupported payload type in destroy: %d", payload->type);
OICFree(payload);
break;
}
{
OCRepPayload* payload = (OCRepPayload*)OICCalloc(1, sizeof(OCRepPayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
void OCRepPayloadAppend(OCRepPayload* parent, OCRepPayload* child)
{
- if(!parent)
+ if (!parent)
{
return;
}
static OCRepPayloadValue* OCRepPayloadFindValue(const OCRepPayload* payload, const char* name)
{
- if(!payload || !name)
+ if (!payload || !name)
{
return NULL;
}
OCRepPayloadValue* val = payload->values;
while(val)
{
- if(0 == strcmp(val->name, name))
+ if (0 == strcmp(val->name, name))
{
return val;
}
}
return NULL;
-
}
static void OCCopyPropertyValueArray(OCRepPayloadValue* dest, OCRepPayloadValue* source)
{
- if(!dest || !source)
+ if (!dest || !source)
{
return;
}
{
case OCREP_PROP_INT:
dest->arr.iArray = (int64_t*)OICMalloc(dimTotal * sizeof(int64_t));
+ VERIFY_PARAM_NON_NULL(TAG, dest->arr.iArray, "Failed allocating memory");
memcpy(dest->arr.iArray, source->arr.iArray, dimTotal * sizeof(int64_t));
break;
case OCREP_PROP_DOUBLE:
dest->arr.dArray = (double*)OICMalloc(dimTotal * sizeof(double));
+ VERIFY_PARAM_NON_NULL(TAG, dest->arr.dArray, "Failed allocating memory");
memcpy(dest->arr.dArray, source->arr.dArray, dimTotal * sizeof(double));
break;
case OCREP_PROP_BOOL:
dest->arr.bArray = (bool*)OICMalloc(dimTotal * sizeof(bool));
+ VERIFY_PARAM_NON_NULL(TAG, dest->arr.bArray, "Failed allocating memory");
memcpy(dest->arr.bArray, source->arr.bArray, dimTotal * sizeof(bool));
break;
case OCREP_PROP_STRING:
dest->arr.strArray = (char**)OICMalloc(dimTotal * sizeof(char*));
+ VERIFY_PARAM_NON_NULL(TAG, dest->arr.strArray, "Failed allocating memory");
for(size_t i = 0; i < dimTotal; ++i)
{
dest->arr.strArray[i] = OICStrdup(source->arr.strArray[i]);
}
break;
+ case OCREP_PROP_OBJECT:
+ dest->arr.objArray = (OCRepPayload**)OICMalloc(dimTotal * sizeof(OCRepPayload*));
+ VERIFY_PARAM_NON_NULL(TAG, dest->arr.objArray, "Failed allocating memory");
+ for(size_t i = 0; i < dimTotal; ++i)
+ {
+ dest->arr.objArray[i] = OCRepPayloadClone(source->arr.objArray[i]);
+ }
+ break;
case OCREP_PROP_ARRAY:
dest->arr.objArray = (OCRepPayload**)OICMalloc(dimTotal * sizeof(OCRepPayload*));
+ VERIFY_PARAM_NON_NULL(TAG, dest->arr.objArray, "Failed allocating memory");
for(size_t i = 0; i < dimTotal; ++i)
{
dest->arr.objArray[i] = OCRepPayloadClone(source->arr.objArray[i]);
}
break;
default:
- OC_LOG(ERROR, TAG, "CopyPropertyValueArray invalid type");
+ OIC_LOG(ERROR, TAG, "CopyPropertyValueArray invalid type");
break;
}
+exit:
+ return;
}
static void OCCopyPropertyValue (OCRepPayloadValue *dest, OCRepPayloadValue *source)
static void OCFreeRepPayloadValueContents(OCRepPayloadValue* val)
{
- if(!val)
+ if (!val)
{
return;
}
- if(val->type == OCREP_PROP_STRING)
+ if (val->type == OCREP_PROP_STRING)
{
OICFree(val->str);
}
- else if(val->type == OCREP_PROP_BYTE_STRING)
+ else if (val->type == OCREP_PROP_BYTE_STRING)
{
OICFree(val->ocByteStr.bytes);
}
OICFree(val->arr.iArray);
break;
case OCREP_PROP_STRING:
- for(size_t i = 0; i< dimTotal;++i)
+ for(size_t i = 0; i< dimTotal; ++i)
{
OICFree(val->arr.strArray[i]);
}
}
OICFree(val->arr.ocByteStrArray);
break;
- case OCREP_PROP_OBJECT:
- for(size_t i = 0; i< dimTotal;++i)
+ case OCREP_PROP_OBJECT: // This case is the temporary fix for string input
+ for(size_t i = 0; i< dimTotal; ++i)
{
OCRepPayloadDestroy(val->arr.objArray[i]);
}
break;
case OCREP_PROP_NULL:
case OCREP_PROP_ARRAY:
- OC_LOG_V(ERROR, TAG, "FreeRepPayloadValueContents: Illegal type\
+ OIC_LOG_V(ERROR, TAG, "FreeRepPayloadValueContents: Illegal type\
inside an array: %d", val->arr.type);
break;
}
static void OCFreeRepPayloadValue(OCRepPayloadValue* val)
{
- if(!val)
+ if (!val)
{
return;
}
static OCRepPayloadValue* OCRepPayloadFindAndSetValue(OCRepPayload* payload, const char* name,
OCRepPayloadPropType type)
{
- if(!payload || !name)
+ if (!payload || !name)
{
return NULL;
}
OCRepPayloadValue* val = payload->values;
- if(val == NULL)
+ if (val == NULL)
{
payload->values = (OCRepPayloadValue*)OICCalloc(1, sizeof(OCRepPayloadValue));
- if(!payload->values)
+ if (!payload->values)
{
return NULL;
}
payload->values->name = OICStrdup(name);
- if(!payload->values->name)
+ if (!payload->values->name)
{
OICFree(payload->values);
payload->values = NULL;
while(val)
{
- if(0 == strcmp(val->name, name))
+ if (0 == strcmp(val->name, name))
{
OCFreeRepPayloadValueContents(val);
val->type = type;
return val;
}
- else if(val->next == NULL)
+ else if (val->next == NULL)
{
val->next = (OCRepPayloadValue*)OICCalloc(1, sizeof(OCRepPayloadValue));
- if(!val->next)
+ if (!val->next)
{
return NULL;
}
val->next->name = OICStrdup(name);
- if(!val->next->name)
+ if (!val->next->name)
{
OICFree(val->next);
val->next = NULL;
val = val->next;
}
- OC_LOG(ERROR, TAG, "FindAndSetValue reached point after while loop, pointer corruption?");
+ OIC_LOG(ERROR, TAG, "FindAndSetValue reached point after while loop, pointer corruption?");
return NULL;
}
bool OCRepPayloadAddResourceTypeAsOwner(OCRepPayload* payload, char* resourceType)
{
- if(!payload || !resourceType)
+ if (!payload || !resourceType)
{
return false;
}
- if(payload->types)
+ if (payload->types)
{
OCStringLL* cur = payload->types;
while(cur->next)
}
cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!cur->next)
+ if (!cur->next)
{
return false;
}
else
{
payload->types = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!payload->types)
+ if (!payload->types)
{
return false;
}
bool OCRepPayloadAddInterfaceAsOwner(OCRepPayload* payload, char* interface)
{
- if(!payload || !interface)
+ if (!payload || !interface)
{
return false;
}
- if(payload->interfaces)
+ if (payload->interfaces)
{
OCStringLL* cur = payload->interfaces;
while(cur->next)
}
cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!cur->next)
+ if (!cur->next)
{
return false;
}
else
{
payload->interfaces = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!payload->interfaces)
+ if (!payload->interfaces)
{
return false;
}
bool OCRepPayloadSetUri(OCRepPayload* payload, const char* uri)
{
- if(!payload)
+ if (!payload)
{
return false;
}
-
+ OICFree(payload->uri);
payload->uri = OICStrdup(uri);
return payload->uri != NULL;
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val)
+ if (!val)
{
return false;
}
void* value, OCRepPayloadPropType type)
{
OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, type);
- if(!val)
+ if (!val)
{
return false;
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_INT)
+ if (!val || val->type != OCREP_PROP_INT)
{
return false;
}
}
bool OCRepPayloadSetPropDouble(OCRepPayload* payload,
- const char* name, double value)
+ const char* name, double value)
{
return OCRepPayloadSetProp(payload, name, &value, OCREP_PROP_DOUBLE);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_DOUBLE)
+ if (val)
{
- return false;
+ if (val->type == OCREP_PROP_DOUBLE)
+ {
+ *value = val->d;
+ return true;
+ }
+ else if (val->type == OCREP_PROP_INT)
+ {
+ *value = val->i;
+ return true;
+ }
}
- *value = val->d;
- return true;
+ return false;
}
bool OCRepPayloadSetPropString(OCRepPayload* payload, const char* name, const char* value)
char* temp = OICStrdup(value);
bool b = OCRepPayloadSetPropStringAsOwner(payload, name, temp);
- if(!b)
+ if (!b)
{
OICFree(temp);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_STRING)
+ if (!val || val->type != OCREP_PROP_STRING)
{
return false;
}
.bytes = (uint8_t*)OICMalloc(value.len * sizeof(uint8_t)),
.len = value.len };
- if(!ocByteStr.bytes)
+ if (!ocByteStr.bytes)
{
return false;
}
bool b = OCRepPayloadSetPropByteStringAsOwner(payload, name, &ocByteStr);
- if(!b)
+ if (!b)
{
OICFree(ocByteStr.bytes);
}
}
bool OCRepPayloadSetPropBool(OCRepPayload* payload,
- const char* name, bool value)
+ const char* name, bool value)
{
return OCRepPayloadSetProp(payload, name, &value, OCREP_PROP_BOOL);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_BOOL)
+ if (!val || val->type != OCREP_PROP_BOOL)
{
return false;
}
OCRepPayload* temp = OCRepPayloadClone(value);
bool b = OCRepPayloadSetPropObjectAsOwner(payload, name, temp);
- if(!b)
+ if (!b)
{
OCRepPayloadDestroy(temp);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_OBJECT)
+ if (!val || val->type != OCREP_PROP_OBJECT)
{
return false;
}
size_t calcDimTotal(const size_t dimensions[MAX_REP_ARRAY_DEPTH])
{
- if(dimensions[0] == 0)
+ if (dimensions[0] == 0)
{
return 0;
}
{
OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY);
- if(!val)
+ if (!val)
{
return false;
}
const int64_t* array, size_t dimensions[MAX_REP_ARRAY_DEPTH])
{
size_t dimTotal = calcDimTotal(dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
int64_t* newArray = (int64_t*)OICMalloc(dimTotal * sizeof(int64_t));
- if(!newArray)
+ if (!newArray)
{
return false;
}
bool b = OCRepPayloadSetIntArrayAsOwner(payload, name, newArray, dimensions);
- if(!b)
+ if (!b)
{
OICFree(newArray);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_INT
+ if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_INT
|| !val->arr.iArray)
{
return false;
}
size_t dimTotal = calcDimTotal(val->arr.dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
*array = (int64_t*)OICMalloc(dimTotal * sizeof(int64_t));
- if(!*array)
+ if (!*array)
{
return false;
}
{
OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY);
- if(!val)
+ if (!val)
{
return false;
}
const double* array, size_t dimensions[MAX_REP_ARRAY_DEPTH])
{
size_t dimTotal = calcDimTotal(dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
double* newArray = (double*)OICMalloc(dimTotal * sizeof(double));
- if(!newArray)
+ if (!newArray)
{
return false;
}
memcpy(newArray, array, dimTotal * sizeof(double));
bool b = OCRepPayloadSetDoubleArrayAsOwner(payload, name, newArray, dimensions);
- if(!b)
+ if (!b)
{
OICFree(newArray);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_DOUBLE
+ if (!val || val->type != OCREP_PROP_ARRAY ||
+ (val->arr.type != OCREP_PROP_DOUBLE && val->arr.type != OCREP_PROP_INT)
|| !val->arr.dArray)
{
return false;
}
size_t dimTotal = calcDimTotal(val->arr.dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
*array = (double*)OICMalloc(dimTotal * sizeof(double));
- if(!*array)
+ if (!*array)
{
return false;
}
- memcpy(*array, val->arr.dArray, dimTotal * sizeof(double));
+ if (val->arr.type != OCREP_PROP_DOUBLE)
+ {
+ memcpy(*array, val->arr.dArray, dimTotal * sizeof(double));
+ }
+ else
+ {
+ /* need to convert from integer */
+ size_t n = 0;
+ for ( ; n < dimTotal; ++n)
+ {
+ (*array)[n] = val->arr.iArray[n];
+ }
+ }
memcpy(dimensions, val->arr.dimensions, MAX_REP_ARRAY_DEPTH * sizeof(size_t));
return true;
}
{
OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY);
- if(!val)
+ if (!val)
{
return false;
}
const char** array, size_t dimensions[MAX_REP_ARRAY_DEPTH])
{
size_t dimTotal = calcDimTotal(dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
char** newArray = (char**)OICMalloc(dimTotal * sizeof(char*));
- if(!newArray)
+ if (!newArray)
{
return false;
}
bool b = OCRepPayloadSetStringArrayAsOwner(payload, name, newArray, dimensions);
- if(!b)
+ if (!b)
{
for(size_t i = 0; i < dimTotal; ++i)
{
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_STRING
+ if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_STRING
|| !val->arr.strArray)
{
return false;
}
size_t dimTotal = calcDimTotal(val->arr.dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
*array = (char**)OICMalloc(dimTotal * sizeof(char*));
- if(!*array)
+ if (!*array)
{
return false;
}
OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY);
- if(!val)
+ if (!val)
{
return false;
}
const bool* array, size_t dimensions[MAX_REP_ARRAY_DEPTH])
{
size_t dimTotal = calcDimTotal(dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
bool* newArray = (bool*)OICMalloc(dimTotal * sizeof(bool));
- if(!newArray)
+ if (!newArray)
{
return false;
}
bool b = OCRepPayloadSetBoolArrayAsOwner(payload, name, newArray, dimensions);
- if(!b)
+ if (!b)
{
OICFree(newArray);
}
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_BOOL
+ if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_BOOL
|| !val->arr.bArray)
{
return false;
}
size_t dimTotal = calcDimTotal(val->arr.dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
*array = (bool*)OICMalloc(dimTotal * sizeof(bool));
- if(!*array)
+ if (!*array)
{
return false;
}
{
OCRepPayloadValue* val = OCRepPayloadFindAndSetValue(payload, name, OCREP_PROP_ARRAY);
- if(!val)
+ if (!val)
{
return false;
}
const OCRepPayload** array, size_t dimensions[MAX_REP_ARRAY_DEPTH])
{
size_t dimTotal = calcDimTotal(dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
OCRepPayload** newArray = (OCRepPayload**)OICMalloc(dimTotal * sizeof(OCRepPayload*));
- if(!newArray)
+ if (!newArray)
{
return false;
}
bool b = OCRepPayloadSetPropObjectArrayAsOwner(payload, name, newArray, dimensions);
- if(!b)
+ if (!b)
{
for(size_t i = 0; i < dimTotal; ++i)
{
{
OCRepPayloadValue* val = OCRepPayloadFindValue(payload, name);
- if(!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_OBJECT
+ if (!val || val->type != OCREP_PROP_ARRAY || val->arr.type != OCREP_PROP_OBJECT
|| !val->arr.objArray)
{
return false;
}
size_t dimTotal = calcDimTotal(val->arr.dimensions);
- if(dimTotal == 0)
+ if (dimTotal == 0)
{
return false;
}
*array = (OCRepPayload**)OICMalloc(dimTotal * sizeof(OCRepPayload*));
- if(!*array)
+ if (!*array)
{
return false;
}
void OCFreeOCStringLL(OCStringLL* ll)
{
- if(!ll)
+ if (!ll)
{
return;
}
void OCRepPayloadDestroy(OCRepPayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
{
OCDiscoveryPayload* payload = (OCDiscoveryPayload*)OICCalloc(1, sizeof(OCDiscoveryPayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
return payload;
}
-OCSecurityPayload* OCSecurityPayloadCreate(const char* securityData)
+OCSecurityPayload* OCSecurityPayloadCreate(const uint8_t* securityData, size_t size)
{
OCSecurityPayload* payload = (OCSecurityPayload*)OICCalloc(1, sizeof(OCSecurityPayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
payload->base.type = PAYLOAD_TYPE_SECURITY;
- payload->securityData = OICStrdup(securityData);
+ payload->securityData = (uint8_t *)OICCalloc(1, size);
+ if (!payload->securityData)
+ {
+ OICFree(payload);
+ return NULL;
+ }
+ memcpy(payload->securityData, (uint8_t *)securityData, size);
+ payload->payloadSize = size;
return payload;
}
void OCSecurityPayloadDestroy(OCSecurityPayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
OCResourcePayload* p = payload->resources;
while(p)
{
- if(i == index)
+ if (i == index)
{
return p;
}
return NULL;
}
-static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t port)
+static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t securePort,
+ uint16_t tcpPort)
{
OCResourcePayload* pl = (OCResourcePayload*)OICCalloc(1, sizeof(OCResourcePayload));
- if(!pl)
+ if (!pl)
{
return NULL;
}
pl->uri = OICStrdup(res->uri);
- pl->sid = (uint8_t*)OICCalloc(1, UUID_SIZE);
- if(!pl->uri || ! pl->sid)
+
+ if (!pl->uri)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
- memcpy(pl->sid, OCGetServerInstanceID(), UUID_SIZE);
// types
OCResourceType* typePtr = res->rsrcType;
- if(typePtr != NULL)
+ if (typePtr != NULL)
{
pl->types = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!pl->types)
+ if (!pl->types)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
pl->types->value = OICStrdup(typePtr->resourcetypename);
- if(!pl->types->value)
+ if (!pl->types->value)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
while(typePtr)
{
cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!cur->next)
+ if (!cur->next)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
cur->next->value = OICStrdup(typePtr->resourcetypename);
- if(!cur->next->value)
+ if (!cur->next->value)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
cur = cur->next;
// interfaces
OCResourceInterface* ifPtr = res->rsrcInterface;
- if(ifPtr != NULL)
+ if (ifPtr != NULL)
{
pl->interfaces = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!pl->interfaces)
+ if (!pl->interfaces)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
pl->interfaces->value = OICStrdup(ifPtr->name);
- if(!pl->interfaces->value)
+ if (!pl->interfaces->value)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
while(ifPtr && cur)
{
cur->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if(!cur->next)
+ if (!cur->next)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
cur->next->value = OICStrdup(ifPtr->name);
- if(!cur->next->value)
+ if (!cur->next->value)
{
- FreeOCDiscoveryResource(pl);
+ OCDiscoveryResourceDestroy(pl);
return NULL;
}
cur = cur->next;
pl->bitmap = res->resourceProperties & (OC_OBSERVABLE | OC_DISCOVERABLE);
pl->secure = (res->resourceProperties & OC_SECURE) != 0;
- pl->port = port;
-
+ pl->port = securePort;
+#ifdef TCP_ADAPTER
+ pl->tcpPort = tcpPort;
+#endif
return pl;
}
void OCDiscoveryPayloadAddResource(OCDiscoveryPayload* payload, const OCResource* res,
- uint16_t port)
+ uint16_t securePort, uint16_t tcpPort)
{
- OCDiscoveryPayloadAddNewResource(payload, OCCopyResource(res, port));
+ OCDiscoveryPayloadAddNewResource(payload, OCCopyResource(res, securePort, tcpPort));
}
-bool OCResourcePayloadAddResourceType(OCResourcePayload* payload, const char* resourceType)
+bool OCResourcePayloadAddStringLL(OCStringLL **stringLL, const char *value)
{
- if (!resourceType)
- {
- return false;
- }
-
- char* dup = OICStrdup(resourceType);
-
- if (!dup)
- {
- return false;
- }
+ char *dup = OICStrdup(value);
+ VERIFY_PARAM_NON_NULL(TAG, dup, "Failed copying string");
+ VERIFY_PARAM_NON_NULL(TAG, value, "Invalid Parameters");
- if (!payload->types)
+ if (!*stringLL)
{
- payload->types = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
-
- if (!payload->types)
- {
- OICFree(dup);
- return false;
- }
-
- payload->types->value = dup;
+ *stringLL = (OCStringLL *)OICCalloc(1, sizeof(OCStringLL));
+ VERIFY_PARAM_NON_NULL(TAG, *stringLL, "Failed allocating memory");
+ (*stringLL)->value = dup;
return true;
}
-
else
{
- OCStringLL* temp = payload->types;
-
+ OCStringLL *temp = *stringLL;
while(temp->next)
{
temp = temp->next;
}
-
- temp->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if (!temp->next)
- {
- OICFree(dup);
- return false;
- }
-
+ temp->next = (OCStringLL *)OICCalloc(1, sizeof(OCStringLL));
+ VERIFY_PARAM_NON_NULL(TAG, temp->next, "Failed allocating memory");
temp->next->value = dup;
return true;
}
+exit:
+ OICFree(dup);
+ return false;
}
-bool OCResourcePayloadAddInterface(OCResourcePayload* payload, const char* interface)
+void OCDiscoveryPayloadAddNewResource(OCDiscoveryPayload* payload, OCResourcePayload* res)
{
- if (!interface)
- {
- return false;
- }
-
- char* dup = OICStrdup(interface);
-
- if (!dup)
- {
- return false;
- }
-
- if (!payload->interfaces)
- {
- payload->interfaces = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
-
- if (!payload->interfaces)
- {
- OICFree(dup);
- return false;
- }
-
- payload->interfaces->value = dup;
- return true;
- }
-
- else
+ if (!payload)
{
- OCStringLL* temp = payload->interfaces;
-
- while(temp->next)
- {
- temp = temp->next;
- }
-
- temp->next = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
- if (!temp->next)
- {
- OICFree(dup);
- return false;
- }
-
- temp->next->value = dup;
- return true;
+ return;
}
-}
-void OCDiscoveryPayloadAddNewResource(OCDiscoveryPayload* payload, OCResourcePayload* res)
-{
- if(!payload->resources)
+ if (!payload->resources)
{
payload->resources = res;
}
}
}
-static void FreeOCDiscoveryResource(OCResourcePayload* payload)
+void OCDiscoveryResourceDestroy(OCResourcePayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
OICFree(payload->uri);
- OICFree(payload->sid);
OCFreeOCStringLL(payload->types);
OCFreeOCStringLL(payload->interfaces);
- FreeOCDiscoveryResource(payload->next);
+ OCDiscoveryResourceDestroy(payload->next);
OICFree(payload);
}
void OCDiscoveryPayloadDestroy(OCDiscoveryPayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
-
- FreeOCDiscoveryResource(payload->resources);
+ OICFree(payload->sid);
+ OICFree(payload->baseURI);
+ OICFree(payload->uri);
+ OICFree(payload->type);
+ OICFree(payload->name);
+ OCFreeOCStringLL(payload->interface);
+ OCDiscoveryResourceDestroy(payload->resources);
OICFree(payload);
}
-OCDevicePayload* OCDevicePayloadCreate(const char* uri, const uint8_t* sid, const char* dname,
- const char* specVer, const char* dmVer)
+OCDevicePayload* OCDevicePayloadCreate(const char* sid, const char* dname,
+ const OCStringLL *types, const char* specVer, const char* dmVer)
{
OCDevicePayload* payload = (OCDevicePayload*)OICCalloc(1, sizeof(OCDevicePayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
payload->base.type = PAYLOAD_TYPE_DEVICE;
-
- payload->uri = OICStrdup(uri);
- if(uri && !payload->uri)
+ payload->sid = OICStrdup(sid);
+ if (sid && !payload->sid)
{
goto exit;
}
- if(sid)
- {
- payload->sid = (uint8_t*)OICMalloc(UUID_SIZE);
- if(!payload->sid)
- {
- goto exit;
- }
- memcpy(payload->sid, sid, UUID_SIZE);
- }
-
payload->deviceName = OICStrdup(dname);
- if(dname && !payload->deviceName)
+ if (dname && !payload->deviceName)
{
goto exit;
}
payload->specVersion = OICStrdup(specVer);
- if(specVer && !payload->specVersion)
+ if (specVer && !payload->specVersion)
{
goto exit;
}
payload->dataModelVersion = OICStrdup(dmVer);
- if(dmVer && !payload->dataModelVersion)
+ if (dmVer && !payload->dataModelVersion)
+ {
+ goto exit;
+ }
+
+ OCResourcePayloadAddStringLL(&payload->interfaces, OC_RSRVD_INTERFACE_DEFAULT);
+ OCResourcePayloadAddStringLL(&payload->interfaces, OC_RSRVD_INTERFACE_READ);
+
+ payload->types = CloneOCStringLL((OCStringLL *)types);
+ if (types && !payload->types)
{
goto exit;
}
void OCDevicePayloadDestroy(OCDevicePayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
- OICFree(payload->uri);
OICFree(payload->sid);
OICFree(payload->deviceName);
OICFree(payload->specVersion);
OICFree(payload->dataModelVersion);
+ OCFreeOCStringLL(payload->types);
+ OCFreeOCStringLL(payload->interfaces);
OICFree(payload);
}
static void OCCopyPlatformInfo(const OCPlatformInfo* platformInfo, OCPlatformPayload* target)
{
- if(!platformInfo || !target)
+ if (!platformInfo || !target)
{
return;
}
target->info.systemTime = OICStrdup(platformInfo->systemTime);
}
-OCPlatformPayload* OCPlatformPayloadCreateAsOwner(char* uri, OCPlatformInfo* platformInfo)
+OCPlatformPayload* OCPlatformPayloadCreateAsOwner(OCPlatformInfo* platformInfo)
{
OCPlatformPayload* payload = (OCPlatformPayload*)OICCalloc(1, sizeof(OCPlatformPayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
payload->base.type = PAYLOAD_TYPE_PLATFORM;
- payload->uri = uri;
+
+ payload->interfaces = (OCStringLL*)OICCalloc(1, sizeof(OCStringLL));
+ if (!payload->interfaces)
+ {
+ return NULL;
+ }
+ payload->interfaces->value = OICStrdup(OC_RSRVD_INTERFACE_READ);
+ payload->rt = OICStrdup(OC_RSRVD_RESOURCE_TYPE_PLATFORM);
payload->info = *platformInfo;
return payload;
}
-OCPlatformPayload* OCPlatformPayloadCreate(const char* uri, const OCPlatformInfo* platformInfo)
+OCPlatformPayload* OCPlatformPayloadCreate(const OCPlatformInfo* platformInfo)
{
OCPlatformPayload* payload = (OCPlatformPayload*)OICCalloc(1, sizeof(OCPlatformPayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
payload->base.type = PAYLOAD_TYPE_PLATFORM;
- payload->uri = OICStrdup(uri);
+ payload->rt = OICStrdup(OC_RSRVD_RESOURCE_TYPE_PLATFORM);
+
+ OCResourcePayloadAddStringLL(&payload->interfaces, OC_RSRVD_INTERFACE_DEFAULT);
+ OCResourcePayloadAddStringLL(&payload->interfaces, OC_RSRVD_INTERFACE_READ);
+
OCCopyPlatformInfo(platformInfo, payload);
return payload;
}
+void OCPlatformInfoDestroy(OCPlatformInfo *info)
+{
+ OICFree(info->platformID);
+ OICFree(info->manufacturerName);
+ OICFree(info->manufacturerUrl);
+ OICFree(info->modelNumber);
+ OICFree(info->dateOfManufacture);
+ OICFree(info->platformVersion);
+ OICFree(info->operatingSystemVersion);
+ OICFree(info->hardwareVersion);
+ OICFree(info->firmwareVersion);
+ OICFree(info->supportUrl);
+ OICFree(info->systemTime);
+}
+
void OCPlatformPayloadDestroy(OCPlatformPayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
OICFree(payload->uri);
- OICFree(payload->info.platformID);
- OICFree(payload->info.manufacturerName);
- OICFree(payload->info.manufacturerUrl);
- OICFree(payload->info.modelNumber);
- OICFree(payload->info.dateOfManufacture);
- OICFree(payload->info.platformVersion);
- OICFree(payload->info.operatingSystemVersion);
- OICFree(payload->info.hardwareVersion);
- OICFree(payload->info.firmwareVersion);
- OICFree(payload->info.supportUrl);
- OICFree(payload->info.systemTime);
+ OCPlatformInfoDestroy(&payload->info);
+ OICFree(payload->rt);
+ OCFreeOCStringLL(payload->interfaces);
OICFree(payload);
}
OCPresenceTrigger trigger, const char* resourceType)
{
OCPresencePayload* payload = (OCPresencePayload*)OICCalloc(1, sizeof(OCPresencePayload));
- if(!payload)
+ if (!payload)
{
return NULL;
}
void OCPresencePayloadDestroy(OCPresencePayload* payload)
{
- if(!payload)
+ if (!payload)
{
return;
}
projects / platform / upstream / iotivity.git / blobdiff