#include <pthread.h>
#endif
-#define TAG "OICGROUP"
+#define TAG "OIC_RI_GROUP"
#define DESC_DELIMITER "\""
#define ACTION_DELIMITER "*"
void AddScheduledResource(ScheduledResourceInfo **head,
ScheduledResourceInfo* add)
{
- OC_LOG(INFO, TAG, "AddScheduledResource Entering...");
+ OIC_LOG(INFO, TAG, "AddScheduledResource Entering...");
#ifndef WITH_ARDUINO
pthread_mutex_lock(&lock);
ScheduledResourceInfo* GetScheduledResource(ScheduledResourceInfo *head)
{
- OC_LOG(INFO, TAG, "GetScheduledResource Entering...");
+ OIC_LOG(INFO, TAG, "GetScheduledResource Entering...");
#ifndef WITH_ARDUINO
pthread_mutex_lock(&lock);
if (diffTm <= (time_t) 0)
{
- OC_LOG(INFO, TAG, "return Call INFO.");
+ OIC_LOG(INFO, TAG, "return Call INFO.");
goto exit;
}
#endif
if (tmp == NULL)
{
- OC_LOG(INFO, TAG, "Cannot Find Call Info.");
+ OIC_LOG(INFO, TAG, "Cannot Find Call Info.");
}
return tmp;
}
ScheduledResourceInfo* GetScheduledResourceByActionSetName(ScheduledResourceInfo *head, char *setName)
{
- OC_LOG(INFO, TAG, "GetScheduledResourceByActionSetName Entering...");
+ OIC_LOG(INFO, TAG, "GetScheduledResourceByActionSetName Entering...");
#ifndef WITH_ARDUINO
pthread_mutex_lock(&lock);
{
if (strcmp(tmp->actionset->actionsetName, setName) == 0)
{
- OC_LOG(INFO, TAG, "return Call INFO.");
+ OIC_LOG(INFO, TAG, "return Call INFO.");
goto exit;
}
tmp = tmp->next;
#endif
if (tmp == NULL)
{
- OC_LOG(INFO, TAG, "Cannot Find Call Info.");
+ OIC_LOG(INFO, TAG, "Cannot Find Call Info.");
}
return tmp;
}
#ifndef WITH_ARDUINO
pthread_mutex_lock(&lock);
#endif
- OC_LOG(INFO, TAG, "RemoveScheduledResource Entering...");
+ OIC_LOG(INFO, TAG, "RemoveScheduledResource Entering...");
ScheduledResourceInfo *tmp = NULL;
if (del == NULL)
return OC_STACK_ERROR;
}
-OCStackResult DeleteActionSets(OCResource** resource)
-{
- OCActionSet *pointer = (*resource)->actionsetHead;
- OCActionSet *pDel = pointer;
-
- while (pointer)
- {
- pDel = pointer;
- pointer = pointer->next;
-
- DeleteActionSet(&pDel);
- pDel->next = NULL;
- }
-
- (*resource)->actionsetHead = NULL;
- return OC_STACK_OK;
-}
-
OCStackResult GetActionSet(const char *actionName, OCActionSet *head,
OCActionSet** actionset)
{
OCAction *action = NULL;
OCCapability *capa = NULL;
- OC_LOG(INFO, TAG, "Build ActionSet Instance.");
+ OIC_LOG(INFO, TAG, "Build ActionSet Instance.");
*set = (OCActionSet*) OICMalloc(sizeof(OCActionSet));
VARIFY_POINTER_NULL(*set, result, exit)
iterToken = (char *) strtok_r(actiondesc, ACTION_DELIMITER, &iterTokenPtr);
+ VARIFY_POINTER_NULL(iterToken, result, exit);
// ActionSet Name
memset(*set, 0, sizeof(OCActionSet));
}
#endif
- OC_LOG_V(INFO, TAG, "ActionSet Name : %s", (*set)->actionsetName);
+ OIC_LOG_V(INFO, TAG, "ActionSet Name : %s", (*set)->actionsetName);
iterToken = (char *) strtok_r(NULL, ACTION_DELIMITER, &iterTokenPtr);
while (iterToken)
attrIterToken = (char *) strtok_r(NULL, ATTR_ASSIGN,
&attrIterTokenPtr);
+ VARIFY_POINTER_NULL(attrIterToken, result, exit);
value = (char *) OICMalloc(strlen(attrIterToken) + 1);
VARIFY_POINTER_NULL(value, result, exit)
VARIFY_PARAM_NULL(attrIterToken, result, exit)
if (strcmp(key, "uri") == 0)
{
- OC_LOG(INFO, TAG, "Build OCAction Instance.");
+ OIC_LOG(INFO, TAG, "Build OCAction Instance.");
action = (OCAction*) OICMalloc(sizeof(OCAction));
VARIFY_POINTER_NULL(action, result, exit)
{
if ((key != NULL) && (value != NULL))
{
- OC_LOG(INFO, TAG, "Build OCCapability Instance.");
+ OIC_LOG(INFO, TAG, "Build OCCapability Instance.");
capa = (OCCapability*) OICMalloc(sizeof(OCCapability));
VARIFY_POINTER_NULL(capa, result, exit)
char temp[1024] = { 0 };
size_t remaining = sizeof(temp) - 1;
OCStackResult res = OC_STACK_ERROR;
+ char* actionTypeStr = NULL;
OCAction *action = actionset->head;
if (remaining >= strlen(actionset->actionsetName) + 1)
{
- strcat(temp, actionset->actionsetName);
+ strncat(temp, actionset->actionsetName, strlen(actionset->actionsetName));
remaining -= strlen(actionset->actionsetName);
- strcat(temp, ACTION_DELIMITER);
+ strncat(temp, ACTION_DELIMITER, strlen(ACTION_DELIMITER));
remaining--;
}
else
goto exit;
}
+ actionTypeStr = (char *)malloc(1024);
+ if(actionTypeStr != NULL)
+ {
+ sprintf(actionTypeStr, "%ld %u", actionset->timesteps, actionset->type);
+ if(remaining >= strlen(actionTypeStr) + strlen(ACTION_DELIMITER) + 1)
+ {
+ strncat(temp, actionTypeStr, strlen(actionTypeStr));
+ remaining -= strlen(actionTypeStr);
+ strncat(temp, ACTION_DELIMITER, strlen(ACTION_DELIMITER));
+ remaining -= strlen(ACTION_DELIMITER);
+ free(actionTypeStr);
+ }
+ else
+ {
+ free(actionTypeStr);
+ res = OC_STACK_ERROR;
+ goto exit;
+ }
+ }
+ else
+ {
+ res = OC_STACK_ERROR;
+ goto exit;
+ }
+
while (action != NULL)
{
if (remaining < (strlen("uri=") + strlen(action->resourceUri) + 1))
res = OC_STACK_ERROR;
goto exit;
}
+
strcat(temp, "uri=");
remaining -= strlen("uri=");
strcat(temp, action->resourceUri);
goto exit;
}
strcat(temp, "|");
+ remaining --;
}
}
{
(void)context;
(void)clientResponse;
- OC_LOG(INFO, TAG, "Entering ActionSetCB");
+ OIC_LOG(INFO, TAG, "Entering ActionSetCB");
ClientRequestInfo *info = GetClientRequestInfo(clientRequstList, handle);
if(NULL == clientResponse->payload)
{
- OC_LOG(ERROR, TAG, "Error sending response");
+ OIC_LOG(ERROR, TAG, "Error sending response");
return OC_STACK_DELETE_TRANSACTION;
}
// Send the response
if (OCDoResponse(&response) != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "Error sending response");
+ OIC_LOG(ERROR, TAG, "Error sending response");
return OC_STACK_DELETE_TRANSACTION;
}
char *jsonStr;
uint16_t jsonLen;
- OC_LOG(INFO, TAG, "Entering BuildActionJSON");
+ OIC_LOG(INFO, TAG, "Entering BuildActionJSON");
json = cJSON_CreateObject();
cJSON_AddItemToObject(json, "rep", body = cJSON_CreateObject());
jsonLen = strlen(jsonStr);
if (jsonLen < *remaining)
{
- strcat((char*) bufferPtr, jsonStr);
+ strncat((char*) bufferPtr, jsonStr, jsonLen);
*remaining -= jsonLen;
bufferPtr += jsonLen;
ret = OC_STACK_OK;
if (!payload)
{
- OC_LOG(INFO, TAG, "Failed to create put payload object");
+ OIC_LOG(INFO, TAG, "Failed to create put payload object");
return NULL;
}
void DoScheduledGroupAction()
{
- OC_LOG(INFO, TAG, "DoScheduledGroupAction Entering...");
+ OIC_LOG(INFO, TAG, "DoScheduledGroupAction Entering...");
ScheduledResourceInfo* info = GetScheduledResource(scheduleResourceList);
if (info == NULL)
{
- OC_LOG(INFO, TAG, "Target resource is NULL");
+ OIC_LOG(INFO, TAG, "Target resource is NULL");
goto exit;
}
else if (info->resource == NULL)
{
- OC_LOG(INFO, TAG, "Target resource is NULL");
+ OIC_LOG(INFO, TAG, "Target resource is NULL");
goto exit;
}
else if (info->actionset == NULL)
{
- OC_LOG(INFO, TAG, "Target ActionSet is NULL");
+ OIC_LOG(INFO, TAG, "Target ActionSet is NULL");
goto exit;
}
else if (info->ehRequest == NULL)
{
- OC_LOG(INFO, TAG, "Target ActionSet is NULL");
+ OIC_LOG(INFO, TAG, "Target ActionSet is NULL");
goto exit;
}
#ifndef WITH_ARDUINO
if (schedule)
{
- OC_LOG(INFO, TAG, "Building New Call Info.");
+ OIC_LOG(INFO, TAG, "Building New Call Info.");
memset(schedule, 0, sizeof(ScheduledResourceInfo));
if (info->actionset->timesteps > 0)
&schedule->timer_id,
&DoScheduledGroupAction);
- OC_LOG(INFO, TAG, "Reregisteration.");
+ OIC_LOG(INFO, TAG, "Reregisteration.");
#ifndef WITH_ARDUINO
pthread_mutex_unlock(&lock);
#endif
{
OCStackResult stackRet = OC_STACK_ERROR;
- OC_LOG(INFO, TAG, "Group Action is requested.");
+ OIC_LOG(INFO, TAG, "Group Action is requested.");
char *doWhat = NULL;
char *details = NULL;
if(stackRet != OC_STACK_OK)
{
- OC_LOG_V(ERROR, TAG, "ExtractKeyValueFromRequest failed: %d", stackRet);
+ OIC_LOG_V(ERROR, TAG, "ExtractKeyValueFromRequest failed: %d", stackRet);
return stackRet;
}
if (method == OC_REST_PUT)
{
- OC_LOG(INFO, TAG, "Group Action[PUT].");
+ OIC_LOG(INFO, TAG, "Group Action[PUT].");
if (strcmp(doWhat, ACTIONSET) == 0)
{
{
DeleteActionSet( &actionSet );
}
- OC_LOG(INFO, TAG, "Duplicated ActionSet ");
+ OIC_LOG(INFO, TAG, "Duplicated ActionSet ");
}
}
else
if(!payload)
{
- OC_LOG(ERROR, TAG, "Failed to allocate Payload");
+ OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
stackRet = OC_STACK_ERROR;
}
else
// Send the response
if (OCDoResponse(&response) != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "Error sending response");
+ OIC_LOG(ERROR, TAG, "Error sending response");
stackRet = OC_STACK_ERROR;
}
}
if (GetActionSet(details, resource->actionsetHead,
&actionset) != OC_STACK_OK)
{
- OC_LOG(INFO, TAG, "ERROR");
+ OIC_LOG(INFO, TAG, "ERROR");
stackRet = OC_STACK_ERROR;
}
if (actionset == NULL)
{
- OC_LOG(INFO, TAG, "Cannot Find ActionSet");
+ OIC_LOG(INFO, TAG, "Cannot Find ActionSet");
stackRet = OC_STACK_ERROR;
}
else
{
- OC_LOG(INFO, TAG, "Group Action[POST].");
+ OIC_LOG(INFO, TAG, "Group Action[POST].");
if (actionset->type == NONE)
{
- OC_LOG_V(INFO, TAG, "Execute ActionSet : %s",
+ OIC_LOG_V(INFO, TAG, "Execute ActionSet : %s",
actionset->actionsetName);
unsigned int num = GetNumOfTargetResource(
actionset->head);
}
else
{
- OC_LOG_V(INFO, TAG, "Execute Scheduled ActionSet : %s",
+ OIC_LOG_V(INFO, TAG, "Execute Scheduled ActionSet : %s",
actionset->actionsetName);
delay =
if (schedule)
{
- OC_LOG(INFO, TAG, "Building New Call Info.");
+ OIC_LOG(INFO, TAG, "Building New Call Info.");
memset(schedule, 0,
sizeof(ScheduledResourceInfo));
#ifndef WITH_ARDUINO
#endif
if (delay > 0)
{
- OC_LOG_V(INFO, TAG, "delay_time is %lf seconds.",
+ OIC_LOG_V(INFO, TAG, "delay_time is %ld seconds.",
actionset->timesteps);
#ifndef WITH_ARDUINO
pthread_mutex_lock(&lock);
if(!payload)
{
- OC_LOG(ERROR, TAG, "Failed to allocate Payload");
+ OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
stackRet = OC_STACK_ERROR;
}
else
// Send the response
if (OCDoResponse(&response) != OC_STACK_OK)
{
- OC_LOG(ERROR, TAG, "Error sending response");
+ OIC_LOG(ERROR, TAG, "Error sending response");
stackRet = OC_STACK_ERROR;
}
}