// Arbitrarily chosen size that seems to contain the majority of packages
#define INIT_SIZE (255)
+// This is six times of the init_size to handle MAX payload.
+#define MAX_SIZE (1530)
+
// Discovery Links Map Length.
#define LINKS_MAP_LEN 4
// Functions all return either a CborError, or a negative version of the OC_STACK return values
-static CborError OCConvertPayloadHelper(OCPayload *payload, uint8_t *outPayload, size_t *size);
-static CborError OCConvertDiscoveryPayload(OCDiscoveryPayload *payload, uint8_t *outPayload,
+static int64_t OCConvertPayloadHelper(OCPayload *payload, uint8_t *outPayload, size_t *size);
+static int64_t OCConvertDiscoveryPayload(OCDiscoveryPayload *payload, uint8_t *outPayload,
size_t *size);
-static CborError OCConvertDevicePayload(OCDevicePayload *payload, uint8_t *outPayload,
+static int64_t OCConvertDevicePayload(OCDevicePayload *payload, uint8_t *outPayload,
size_t *size);
-static CborError OCConvertPlatformPayload(OCPlatformPayload *payload, uint8_t *outPayload,
+static int64_t OCConvertPlatformPayload(OCPlatformPayload *payload, uint8_t *outPayload,
size_t *size);
-static CborError OCConvertRepPayload(OCRepPayload *payload, uint8_t *outPayload, size_t *size);
-static CborError OCConvertRepMap(CborEncoder *map, const OCRepPayload *payload);
-static CborError OCConvertPresencePayload(OCPresencePayload *payload, uint8_t *outPayload,
+static int64_t OCConvertRepPayload(OCRepPayload *payload, uint8_t *outPayload, size_t *size);
+static int64_t OCConvertRepMap(CborEncoder *map, const OCRepPayload *payload);
+static int64_t OCConvertPresencePayload(OCPresencePayload *payload, uint8_t *outPayload,
size_t *size);
-static CborError OCConvertSecurityPayload(OCSecurityPayload *payload, uint8_t *outPayload,
+static int64_t OCConvertSecurityPayload(OCSecurityPayload *payload, uint8_t *outPayload,
size_t *size);
-static CborError OCConvertSingleRepPayload(CborEncoder *parent, const OCRepPayload *payload);
-static CborError OCConvertArray(CborEncoder *parent, const OCRepPayloadValueArray *valArray);
+static int64_t OCConvertSingleRepPayload(CborEncoder *parent, const OCRepPayload *payload);
+static int64_t OCConvertArray(CborEncoder *parent, const OCRepPayloadValueArray *valArray);
-static CborError AddTextStringToMap(CborEncoder *map, const char *key, size_t keylen,
+static int64_t AddTextStringToMap(CborEncoder *map, const char *key, size_t keylen,
const char *value);
-static CborError ConditionalAddTextStringToMap(CborEncoder *map, const char *key, size_t keylen,
+static int64_t ConditionalAddTextStringToMap(CborEncoder *map, const char *key, size_t keylen,
const char *value);
OCStackResult OCConvertPayload(OCPayload* payload, uint8_t** outPayload, size_t* size)
#undef CborNeedsUpdating
OCStackResult ret = OC_STACK_INVALID_PARAM;
- CborError err;
+ int64_t err;
uint8_t *out = NULL;
size_t curSize = INIT_SIZE;
if (err == CborErrorOutOfMemory)
{
// reallocate "out" and try again!
- uint8_t* out2 = (uint8_t *)OICRealloc(out, curSize);
+ uint8_t *out2 = (uint8_t *)OICRealloc(out, curSize);
VERIFY_PARAM_NON_NULL(TAG, out2, "Failed to increase payload size");
out = out2;
err = OCConvertPayloadHelper(payload, out, &curSize);
+ while (err == CborErrorOutOfMemory && curSize < MAX_SIZE)
+ {
+ uint8_t *out2 = (uint8_t *)OICRealloc(out, curSize);
+ VERIFY_PARAM_NON_NULL(TAG, out2, "Failed to increase payload size");
+ out = out2;
+ err = OCConvertPayloadHelper(payload, out, &curSize);
+ }
}
if (err == CborNoError)
*size = curSize;
*outPayload = out;
+ OIC_LOG_V(DEBUG, TAG, "Payload Size: %zd Payload : %s \n", *size, *outPayload);
return OC_STACK_OK;
}
return ret;
}
-static CborError OCConvertPayloadHelper(OCPayload* payload, uint8_t* outPayload, size_t* size)
+static int64_t OCConvertPayloadHelper(OCPayload* payload, uint8_t* outPayload, size_t* size)
{
switch(payload->type)
{
}
}
-static CborError checkError(CborError err, CborEncoder* encoder, uint8_t* outPayload, size_t* size)
+static int64_t checkError(int64_t err, CborEncoder* encoder, uint8_t* outPayload, size_t* size)
{
if (err == CborErrorOutOfMemory)
{
}
}
-static CborError OCConvertSecurityPayload(OCSecurityPayload* payload, uint8_t* outPayload,
+static int64_t OCConvertSecurityPayload(OCSecurityPayload* payload, uint8_t* outPayload,
size_t* size)
{
CborEncoder encoder;
cbor_encoder_init(&encoder, outPayload, *size, 0);
CborEncoder map;
- CborError err = cbor_encoder_create_map(&encoder, &map, CborIndefiniteLength);
+ int64_t err = cbor_encoder_create_map(&encoder, &map, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Creating security map");
if (payload->securityData)
{
- err = cbor_encode_text_string(&map, payload->securityData,
+ err |= cbor_encode_text_string(&map, payload->securityData,
strlen(payload->securityData));
VERIFY_CBOR_SUCCESS(TAG, err, "Retrieving security data");
}
- err = cbor_encoder_close_container(&encoder, &map);
+ err |= cbor_encoder_close_container(&encoder, &map);
VERIFY_CBOR_SUCCESS(TAG, err, "closing security map");
exit:
return checkError(err, &encoder, outPayload, size);
return joinedStr;
}
-static CborError OCConvertDiscoveryPayload(OCDiscoveryPayload *payload, uint8_t *outPayload,
+static int64_t OCConvertDiscoveryPayload(OCDiscoveryPayload *payload, uint8_t *outPayload,
size_t *size)
{
CborEncoder encoder;
- CborError err = CborNoError;
+ int64_t err = CborNoError;
cbor_encoder_init(&encoder, outPayload, *size, 0);
// Open the main root array
CborEncoder rootArray;
size_t resourceCount = OCDiscoveryPayloadGetResourceCount(payload);
- err = cbor_encoder_create_array(&encoder, &rootArray, 1);
+ err |= cbor_encoder_create_array(&encoder, &rootArray, 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating discovery root array");
// Open the root map in the root array
CborEncoder rootMap;
- err = cbor_encoder_create_map(&rootArray, &rootMap, CborIndefiniteLength);
+ err |= cbor_encoder_create_map(&rootArray, &rootMap, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating discovery map");
// Insert Device ID into the root map
- err = cbor_encode_text_string(&rootMap, OC_RSRVD_DEVICE_ID,
- sizeof(OC_RSRVD_DEVICE_ID) - 1);
+ err |= cbor_encode_text_string(&rootMap, OC_RSRVD_DEVICE_ID, sizeof(OC_RSRVD_DEVICE_ID) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting tag device id");
- err = cbor_encode_byte_string(&rootMap, payload->sid, UUID_SIZE);
+ err |= cbor_encode_byte_string(&rootMap, payload->sid, UUID_SIZE);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting value of device id");
// Insert baseURI if present
- err = ConditionalAddTextStringToMap(&rootMap, OC_RSRVD_BASE_URI,
+ err |= ConditionalAddTextStringToMap(&rootMap, OC_RSRVD_BASE_URI,
sizeof(OC_RSRVD_BASE_URI) - 1,
payload->baseURI);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting baseURI");
// Insert Links into the root map.
CborEncoder linkArray;
- err = cbor_encode_text_string(&rootMap, OC_RSRVD_LINKS, sizeof(OC_RSRVD_LINKS) - 1);
+ err |= cbor_encode_text_string(&rootMap, OC_RSRVD_LINKS, sizeof(OC_RSRVD_LINKS) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting links array tag");
- err = cbor_encoder_create_array(&rootMap, &linkArray, resourceCount);
+ err |= cbor_encoder_create_array(&rootMap, &linkArray, resourceCount);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting links array");
for(size_t i = 0; i < resourceCount; ++i)
VERIFY_PARAM_NON_NULL(TAG, resource, "Failed retrieving resource");
// resource map inside the links array.
- err = cbor_encoder_create_map(&linkArray, &linkMap, LINKS_MAP_LEN);
+ err |= cbor_encoder_create_map(&linkArray, &linkMap, LINKS_MAP_LEN);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating links map");
// Below are insertions of the resource properties into the map.
// Uri
- err = AddTextStringToMap(&linkMap, OC_RSRVD_HREF, sizeof(OC_RSRVD_HREF) - 1,
+ err |= AddTextStringToMap(&linkMap, OC_RSRVD_HREF, sizeof(OC_RSRVD_HREF) - 1,
resource->uri);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding uri to links map");
// Resource Type
if (resource->types)
{
- err = cbor_encode_text_string(&linkMap, OC_RSRVD_RESOURCE_TYPE,
+ err |= cbor_encode_text_string(&linkMap, OC_RSRVD_RESOURCE_TYPE,
sizeof(OC_RSRVD_RESOURCE_TYPE) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding resource types tag to links map");
char *joinedTypes = OCStringLLJoin(resource->types);
VERIFY_PARAM_NON_NULL(TAG, joinedTypes, "Failed creating joined string");
- err = cbor_encode_text_string(&linkMap, joinedTypes, strlen(joinedTypes));
+ err |= cbor_encode_text_string(&linkMap, joinedTypes, strlen(joinedTypes));
OICFree(joinedTypes);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding resource types value to links map");
}
// Interface Types
if (resource->interfaces)
{
- err = cbor_encode_text_string(&linkMap, OC_RSRVD_INTERFACE,
+ err |= cbor_encode_text_string(&linkMap, OC_RSRVD_INTERFACE,
sizeof(OC_RSRVD_INTERFACE) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding interfaces tag to links map");
char* joinedInterfaces = OCStringLLJoin(resource->interfaces);
VERIFY_PARAM_NON_NULL(TAG, joinedInterfaces, "Failed creating joined string");
- err = cbor_encode_text_string(&linkMap, joinedInterfaces, strlen(joinedInterfaces));
+ err |= cbor_encode_text_string(&linkMap, joinedInterfaces, strlen(joinedInterfaces));
OICFree(joinedInterfaces);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding interfaces value to links map");
}
// Policy
CborEncoder policyMap;
- err = cbor_encode_text_string(&linkMap, OC_RSRVD_POLICY, sizeof(OC_RSRVD_POLICY) - 1);
+ err |= cbor_encode_text_string(&linkMap, OC_RSRVD_POLICY, sizeof(OC_RSRVD_POLICY) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding policy tag to links map");
- err = cbor_encoder_create_map(&linkMap, &policyMap, CborIndefiniteLength);
+ err |= cbor_encoder_create_map(&linkMap, &policyMap, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding policy map to links map");
// Bitmap
- err = cbor_encode_text_string(&policyMap, OC_RSRVD_BITMAP, sizeof(OC_RSRVD_BITMAP) - 1);
+ err |= cbor_encode_text_string(&policyMap, OC_RSRVD_BITMAP, sizeof(OC_RSRVD_BITMAP) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding bitmap tag to policy map");
- err = cbor_encode_uint(&policyMap, resource->bitmap);
+ err |= cbor_encode_uint(&policyMap, resource->bitmap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding bitmap value to policy map");
if (resource->secure)
{
- err = cbor_encode_text_string(&policyMap, OC_RSRVD_SECURE,
+ err |= cbor_encode_text_string(&policyMap, OC_RSRVD_SECURE,
sizeof(OC_RSRVD_SECURE) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding secure tag to policy map");
- err = cbor_encode_boolean(&policyMap, OC_RESOURCE_SECURE);
+ err |= cbor_encode_boolean(&policyMap, OC_RESOURCE_SECURE);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding secure value to policy map");
}
if ((resource->secure && resource->port != 0) || payload->baseURI)
{
- err = cbor_encode_text_string(&policyMap, OC_RSRVD_HOSTING_PORT,
+ err |= cbor_encode_text_string(&policyMap, OC_RSRVD_HOSTING_PORT,
sizeof(OC_RSRVD_HOSTING_PORT) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding secure port tag");
- err = cbor_encode_uint(&policyMap, resource->port);
+ err |= cbor_encode_uint(&policyMap, resource->port);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding secure port value");
}
- err = cbor_encoder_close_container(&linkMap, &policyMap);
+ err |= cbor_encoder_close_container(&linkMap, &policyMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing policy map");
// Finsihed encoding a resource, close the map.
- err = cbor_encoder_close_container(&linkArray, &linkMap);
+ err |= cbor_encoder_close_container(&linkArray, &linkMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing link map");
}
// Close links array inside the root map.
- err = cbor_encoder_close_container(&rootMap, &linkArray);
+ err |= cbor_encoder_close_container(&rootMap, &linkArray);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing link array");
// close root map inside the root array.
- err = cbor_encoder_close_container(&rootArray, &rootMap);
+ err |= cbor_encoder_close_container(&rootArray, &rootMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing root map");
// Close the final root array.
- err = cbor_encoder_close_container(&encoder, &rootArray);
+ err |= cbor_encoder_close_container(&encoder, &rootArray);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing root array");
}
return checkError(err, &encoder, outPayload, size);
}
-static CborError OCConvertDevicePayload(OCDevicePayload *payload, uint8_t *outPayload,
+static int64_t OCConvertDevicePayload(OCDevicePayload *payload, uint8_t *outPayload,
size_t *size)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
CborEncoder encoder;
cbor_encoder_init(&encoder, outPayload, *size, 0);
CborEncoder repMap;
- err = cbor_encoder_create_map(&encoder, &repMap, CborIndefiniteLength);
+ err |= cbor_encoder_create_map(&encoder, &repMap, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating device map");
// Device ID
- err = cbor_encode_text_string(&repMap, OC_RSRVD_DEVICE_ID, sizeof(OC_RSRVD_DEVICE_ID) - 1);
+ err |= cbor_encode_text_string(&repMap, OC_RSRVD_DEVICE_ID, sizeof(OC_RSRVD_DEVICE_ID) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding device id tag");
- err = cbor_encode_byte_string(&repMap, payload->sid, UUID_SIZE);
+ err |= cbor_encode_byte_string(&repMap, payload->sid, UUID_SIZE);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding data device id");
// Device Name
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_DEVICE_NAME,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_DEVICE_NAME,
sizeof(OC_RSRVD_DEVICE_NAME) - 1, payload->deviceName);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding device name");
// Device Spec Version
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_SPEC_VERSION,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_SPEC_VERSION,
sizeof(OC_RSRVD_SPEC_VERSION) - 1, payload->specVersion);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding data spec version");
// Device data Model Version
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_DATA_MODEL_VERSION,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_DATA_MODEL_VERSION,
sizeof(OC_RSRVD_DATA_MODEL_VERSION) - 1, payload->dataModelVersion);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding data model version");
- err = cbor_encoder_close_container(&encoder, &repMap);
+ err |= cbor_encoder_close_container(&encoder, &repMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing device map");
exit:
return checkError(err, &encoder, outPayload, size);
}
-static CborError OCConvertPlatformPayload(OCPlatformPayload *payload, uint8_t *outPayload,
+static int64_t OCConvertPlatformPayload(OCPlatformPayload *payload, uint8_t *outPayload,
size_t *size)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
CborEncoder encoder;
cbor_encoder_init(&encoder, outPayload, *size, 0);
CborEncoder repMap;
- err = cbor_encoder_create_map(&encoder, &repMap, CborIndefiniteLength);
+ err |= cbor_encoder_create_map(&encoder, &repMap, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating platform map");
// Platform ID
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_PLATFORM_ID,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_PLATFORM_ID,
sizeof(OC_RSRVD_PLATFORM_ID) - 1, payload->info.platformID);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding platform id");
// MFG Name
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MFG_NAME, sizeof(OC_RSRVD_MFG_NAME) - 1,
- payload->info.manufacturerName);
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MFG_NAME,
+ sizeof(OC_RSRVD_MFG_NAME) - 1, payload->info.manufacturerName);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding mfg name");
// MFG Url
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MFG_URL, sizeof(OC_RSRVD_MFG_URL) - 1,
- payload->info.manufacturerUrl);
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MFG_URL,
+ sizeof(OC_RSRVD_MFG_URL) - 1, payload->info.manufacturerUrl);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding mfg url");
// Model Num
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MODEL_NUM, sizeof(OC_RSRVD_MODEL_NUM) -1,
- payload->info.modelNumber);
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MODEL_NUM,
+ sizeof(OC_RSRVD_MODEL_NUM) -1, payload->info.modelNumber);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding model num");
// Date of Mfg
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MFG_DATE, sizeof(OC_RSRVD_MFG_DATE) - 1,
- payload->info.dateOfManufacture);
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_MFG_DATE,
+ sizeof(OC_RSRVD_MFG_DATE) - 1, payload->info.dateOfManufacture);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding mfg date");
// Platform Version
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_PLATFORM_VERSION,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_PLATFORM_VERSION,
sizeof(OC_RSRVD_PLATFORM_VERSION) - 1, payload->info.platformVersion);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding platform version");
// OS Version
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_OS_VERSION,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_OS_VERSION,
sizeof(OC_RSRVD_OS_VERSION) - 1, payload->info.operatingSystemVersion);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding OS version");
// Hardware Version
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_HARDWARE_VERSION,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_HARDWARE_VERSION,
sizeof(OC_RSRVD_HARDWARE_VERSION) - 1, payload->info.hardwareVersion);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding HW version");
// Firmware Version
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_FIRMWARE_VERSION,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_FIRMWARE_VERSION,
sizeof(OC_RSRVD_FIRMWARE_VERSION) - 1, payload->info.firmwareVersion);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding firmware version");
// Support URL
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_SUPPORT_URL,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_SUPPORT_URL,
sizeof(OC_RSRVD_SUPPORT_URL) - 1, payload->info.supportUrl);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding support url");
// System Time
- err = ConditionalAddTextStringToMap(&repMap, OC_RSRVD_SYSTEM_TIME,
+ err |= ConditionalAddTextStringToMap(&repMap, OC_RSRVD_SYSTEM_TIME,
sizeof(OC_RSRVD_SYSTEM_TIME) - 1, payload->info.systemTime);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding system time");
// Close Map
- err = cbor_encoder_close_container(&encoder, &repMap);
+ err |= cbor_encoder_close_container(&encoder, &repMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing rep map");
exit:
return checkError(err, &encoder, outPayload, size);
}
-static CborError OCConvertArrayItem(CborEncoder *array, const OCRepPayloadValueArray *valArray,
+static int64_t OCConvertArrayItem(CborEncoder *array, const OCRepPayloadValueArray *valArray,
size_t index)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
switch (valArray->type)
{
case OCREP_PROP_NULL:
err = CborUnknownError;
break;
case OCREP_PROP_INT:
- err = cbor_encode_int(array, valArray->iArray[index]);
+ err |= cbor_encode_int(array, valArray->iArray[index]);
break;
case OCREP_PROP_DOUBLE:
- err = cbor_encode_double(array, valArray->dArray[index]);
+ err |= cbor_encode_double(array, valArray->dArray[index]);
break;
case OCREP_PROP_BOOL:
- err = cbor_encode_boolean(array, valArray->bArray[index]);
+ err |= cbor_encode_boolean(array, valArray->bArray[index]);
break;
case OCREP_PROP_STRING:
if (!valArray->strArray[index])
{
- err = cbor_encode_null(array);
+ err |= cbor_encode_null(array);
}
else
{
- err = cbor_encode_text_string(array, valArray->strArray[index],
+ err |= cbor_encode_text_string(array, valArray->strArray[index],
strlen(valArray->strArray[index]));
}
break;
case OCREP_PROP_BYTE_STRING:
if (!valArray->strArray[index])
{
- err = cbor_encode_null(array);
+ err |= cbor_encode_null(array);
}
else
{
- err = cbor_encode_byte_string(array, valArray->ocByteStrArray[index].bytes,
+ err |= cbor_encode_byte_string(array, valArray->ocByteStrArray[index].bytes,
valArray->ocByteStrArray[index].len);
}
break;
case OCREP_PROP_OBJECT:
if (!valArray->objArray[index])
{
- err = cbor_encode_null(array);
+ err |= cbor_encode_null(array);
}
else
{
- err = OCConvertRepMap(array, valArray->objArray[index]);
+ err |= OCConvertRepMap(array, valArray->objArray[index]);
}
break;
case OCREP_PROP_ARRAY:
return err;
}
-static CborError OCConvertArray(CborEncoder *parent, const OCRepPayloadValueArray *valArray)
+static int64_t OCConvertArray(CborEncoder *parent, const OCRepPayloadValueArray *valArray)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
CborEncoder array;
- err = cbor_encoder_create_array(parent, &array, valArray->dimensions[0]);
+ err |= cbor_encoder_create_array(parent, &array, valArray->dimensions[0]);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating rep array");
for (size_t i = 0; i < valArray->dimensions[0]; ++i)
if (0 != valArray->dimensions[1])
{
CborEncoder array2;
- err = cbor_encoder_create_array(&array, &array2, valArray->dimensions[1]);
+ err |= cbor_encoder_create_array(&array, &array2, valArray->dimensions[1]);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating rep array2");
for (size_t j = 0; j < valArray->dimensions[1]; ++j)
if (0 != valArray->dimensions[2])
{
CborEncoder array3;
- err = cbor_encoder_create_array(&array2, &array3, valArray->dimensions[2]);
+ err |= cbor_encoder_create_array(&array2, &array3, valArray->dimensions[2]);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating rep array3");
for(size_t k = 0; k < valArray->dimensions[2]; ++k)
{
- err = OCConvertArrayItem(&array3, valArray,
+ err |= OCConvertArrayItem(&array3, valArray,
j * valArray->dimensions[2] +
i * valArray->dimensions[2] * valArray->dimensions[1] +
k);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep array3 value");
}
- err = cbor_encoder_close_container(&array2, &array3);
+ err |= cbor_encoder_close_container(&array2, &array3);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing rep array3");
}
else
{
- err = OCConvertArrayItem(&array2, valArray, i * valArray->dimensions[1] + j);
+ err |= OCConvertArrayItem(&array2, valArray, i * valArray->dimensions[1] + j);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep array2 value");
}
}
- err = cbor_encoder_close_container(&array, &array2);
+ err |= cbor_encoder_close_container(&array, &array2);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing rep array2");
}
else
{
- err = OCConvertArrayItem(&array, valArray, i);
+ err |= OCConvertArrayItem(&array, valArray, i);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep array value");
}
}
- err = cbor_encoder_close_container(parent, &array);
+ err |= cbor_encoder_close_container(parent, &array);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing rep array");
exit:
return err;
}
-static CborError OCConvertRepMap(CborEncoder *map, const OCRepPayload *payload)
+static int64_t OCConvertRepMap(CborEncoder *map, const OCRepPayload *payload)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
CborEncoder repMap;
- err = cbor_encoder_create_map(map, &repMap, CborIndefiniteLength);
+ err |= cbor_encoder_create_map(map, &repMap, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating rep map");
- err = OCConvertSingleRepPayload(&repMap, payload);
+ err |= OCConvertSingleRepPayload(&repMap, payload);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed converting single rep payload");
- err = cbor_encoder_close_container(map, &repMap);
+ err |= cbor_encoder_close_container(map, &repMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing rep map");
exit:
return err;
}
-static CborError OCConvertSingleRepPayload(CborEncoder *repMap, const OCRepPayload *payload)
+static int64_t OCConvertSingleRepPayload(CborEncoder *repMap, const OCRepPayload *payload)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
OCRepPayloadValue *value = payload->values;
while (value)
{
- err = cbor_encode_text_string(repMap, value->name, strlen(value->name));
+ err |= cbor_encode_text_string(repMap, value->name, strlen(value->name));
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding tag name");
switch (value->type)
{
case OCREP_PROP_NULL:
- err = cbor_encode_null(repMap);
+ err |= cbor_encode_null(repMap);
break;
case OCREP_PROP_INT:
- err = cbor_encode_int(repMap, value->i);
+ err |= cbor_encode_int(repMap, value->i);
break;
case OCREP_PROP_DOUBLE:
- err = cbor_encode_double(repMap, value->d);
+ err |= cbor_encode_double(repMap, value->d);
break;
case OCREP_PROP_BOOL:
- err = cbor_encode_boolean(repMap, value->b);
+ err |= cbor_encode_boolean(repMap, value->b);
break;
case OCREP_PROP_STRING:
- err = cbor_encode_text_string(repMap, value->str, strlen(value->str));
+ err |= cbor_encode_text_string(repMap, value->str, strlen(value->str));
break;
case OCREP_PROP_BYTE_STRING:
- err = cbor_encode_byte_string(repMap, value->ocByteStr.bytes, value->ocByteStr.len);
+ err |= cbor_encode_byte_string(repMap, value->ocByteStr.bytes, value->ocByteStr.len);
break;
case OCREP_PROP_OBJECT:
- err = OCConvertRepMap(repMap, value->obj);
+ err |= OCConvertRepMap(repMap, value->obj);
break;
case OCREP_PROP_ARRAY:
- err = OCConvertArray(repMap, &value->arr);
+ err |= OCConvertArray(repMap, &value->arr);
break;
default:
OIC_LOG_V(ERROR, TAG, "Invalid Prop type: %d", value->type);
return err;
}
-static CborError OCConvertRepPayload(OCRepPayload *payload, uint8_t *outPayload, size_t *size)
+static int64_t OCConvertRepPayload(OCRepPayload *payload, uint8_t *outPayload, size_t *size)
{
CborEncoder encoder;
- CborError err = CborNoError;
+ int64_t err = CborNoError;
cbor_encoder_init(&encoder, outPayload, *size, 0);
CborEncoder rootArray;
if (arrayCount > 1)
{
- err = cbor_encoder_create_array(&encoder, &rootArray, arrayCount);
+ err |= cbor_encoder_create_array(&encoder, &rootArray, arrayCount);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep root map");
}
while (payload != NULL && (err == CborNoError))
{
CborEncoder rootMap;
- err = cbor_encoder_create_map(((arrayCount == 1)? &encoder: &rootArray),
+ err |= cbor_encoder_create_map(((arrayCount == 1)? &encoder: &rootArray),
&rootMap, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating root map");
if (arrayCount > 1 && payload->uri && strlen(payload->uri) > 0)
{
OIC_LOG(INFO, TAG, "Payload has uri");
- err = cbor_encode_text_string(&rootMap, OC_RSRVD_HREF, strlen(OC_RSRVD_HREF));
+ err |= cbor_encode_text_string(&rootMap, OC_RSRVD_HREF, strlen(OC_RSRVD_HREF));
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep href tag");
- err = cbor_encode_text_string(&rootMap, payload->uri, strlen(payload->uri));
+ err |= cbor_encode_text_string(&rootMap, payload->uri, strlen(payload->uri));
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep href value");
}
if (payload->types)
{
OIC_LOG(INFO, TAG, "Payload has types");
- err = cbor_encode_text_string(&rootMap, OC_RSRVD_RESOURCE_TYPE,
+ err |= cbor_encode_text_string(&rootMap, OC_RSRVD_RESOURCE_TYPE,
sizeof(OC_RSRVD_RESOURCE_TYPE) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep resource type tag");
char* joinedTypes = OCStringLLJoin(payload->types);
VERIFY_PARAM_NON_NULL(TAG, joinedTypes, "Failed creating joined string");
- err = cbor_encode_text_string(&rootMap, joinedTypes, strlen(joinedTypes));
+ err |= cbor_encode_text_string(&rootMap, joinedTypes, strlen(joinedTypes));
OICFree(joinedTypes);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep resource type value");
}
if (payload->interfaces)
{
OIC_LOG(INFO, TAG, "Payload has interfaces");
- err = cbor_encode_text_string(&rootMap, OC_RSRVD_INTERFACE,
+ err |= cbor_encode_text_string(&rootMap, OC_RSRVD_INTERFACE,
sizeof(OC_RSRVD_INTERFACE) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep interface tag");
char* joinedInterfaces = OCStringLLJoin(payload->interfaces);
VERIFY_PARAM_NON_NULL(TAG, joinedInterfaces, "Failed creating joined string");
- err = cbor_encode_text_string(&rootMap, joinedInterfaces, strlen(joinedInterfaces));
+ err |= cbor_encode_text_string(&rootMap, joinedInterfaces, strlen(joinedInterfaces));
OICFree(joinedInterfaces);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding rep interface value");
}
- err = OCConvertSingleRepPayload(&rootMap, payload);
+ err |= OCConvertSingleRepPayload(&rootMap, payload);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed setting rep payload");
// Close main array
- err = cbor_encoder_close_container(((arrayCount == 1) ? &encoder: &rootArray), &rootMap);
+ err |= cbor_encoder_close_container(((arrayCount == 1) ? &encoder: &rootArray),
+ &rootMap);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing root map");
payload = payload->next;
}
if (arrayCount > 1)
{
- err = cbor_encoder_close_container(&encoder, &rootArray);
+ err |= cbor_encoder_close_container(&encoder, &rootArray);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing root array");
}
return checkError(err, &encoder, outPayload, size);
}
-static CborError OCConvertPresencePayload(OCPresencePayload *payload, uint8_t *outPayload,
+static int64_t OCConvertPresencePayload(OCPresencePayload *payload, uint8_t *outPayload,
size_t *size)
{
- CborError err = CborNoError;
+ int64_t err = CborNoError;
CborEncoder encoder;
cbor_encoder_init(&encoder, outPayload, *size, 0);
CborEncoder map;
- err = cbor_encoder_create_map(&encoder, &map, CborIndefiniteLength);
+ err |= cbor_encoder_create_map(&encoder, &map, CborIndefiniteLength);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating presence map");
// Sequence Number
- err = cbor_encode_text_string(&map, OC_RSRVD_NONCE, sizeof(OC_RSRVD_NONCE) - 1);
+ err |= cbor_encode_text_string(&map, OC_RSRVD_NONCE, sizeof(OC_RSRVD_NONCE) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding nonce tag to presence map");
- err = cbor_encode_uint(&map, payload->sequenceNumber);
+ err |= cbor_encode_uint(&map, payload->sequenceNumber);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding nonce value to presence map");
// Max Age
- err = cbor_encode_text_string(&map, OC_RSRVD_TTL, sizeof(OC_RSRVD_TTL) - 1);
+ err |= cbor_encode_text_string(&map, OC_RSRVD_TTL, sizeof(OC_RSRVD_TTL) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding ttl tag to presence map");
- err = cbor_encode_uint(&map, payload->maxAge);
+ err |= cbor_encode_uint(&map, payload->maxAge);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding ttl value to presence map");
// Trigger
- err = cbor_encode_text_string(&map, OC_RSRVD_TRIGGER, sizeof(OC_RSRVD_TRIGGER) - 1);
+ err |= cbor_encode_text_string(&map, OC_RSRVD_TRIGGER, sizeof(OC_RSRVD_TRIGGER) - 1);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding trigger tag to presence map");
- err = cbor_encode_simple_value(&map, payload->trigger);
+ err |= cbor_encode_simple_value(&map, payload->trigger);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding trigger value to presence map");
// Resource type name
if (payload->trigger != OC_PRESENCE_TRIGGER_DELETE)
{
- err = ConditionalAddTextStringToMap(&map, OC_RSRVD_RESOURCE_TYPE,
+ err |= ConditionalAddTextStringToMap(&map, OC_RSRVD_RESOURCE_TYPE,
sizeof(OC_RSRVD_RESOURCE_TYPE) - 1, payload->resourceType);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding resource type to presence map");
}
// Close Map
- err = cbor_encoder_close_container(&encoder, &map);
+ err |= cbor_encoder_close_container(&encoder, &map);
VERIFY_CBOR_SUCCESS(TAG, err, "Failed closing presence map");
exit:
return checkError(err, &encoder, outPayload, size);
}
-static CborError AddTextStringToMap(CborEncoder* map, const char* key, size_t keylen,
+static int64_t AddTextStringToMap(CborEncoder* map, const char* key, size_t keylen,
const char* value)
{
- CborError err = cbor_encode_text_string(map, key, keylen);
+ int64_t err = cbor_encode_text_string(map, key, keylen);
if (CborNoError != err)
{
return err;
return cbor_encode_text_string(map, value, strlen(value));
}
-static CborError ConditionalAddTextStringToMap(CborEncoder* map, const char* key, size_t keylen,
+static int64_t ConditionalAddTextStringToMap(CborEncoder* map, const char* key, size_t keylen,
const char* value)
{
- return value ? AddTextStringToMap(map, key, keylen, value) : CborNoError;
+ return value ? AddTextStringToMap(map, key, keylen, value) : 0;
}
projects / platform / upstream / iotivity.git / commitdiff