unsigned int signal_number;
char *bus_name;
int types;
- int observer_id;
+ int observe_id;
int observe_action;
OCRequestHandle request_h;
OCResourceHandle resource_h;
ctx->options,
ctx->query,
action,
- ctx->observer_id,
+ ctx->observe_id,
&payload_builder,
ICD_POINTER_TO_INT64(ctx->request_h),
ICD_POINTER_TO_INT64(ctx->resource_h));
if (OC_OBSERVE_FLAG & flag) {
req_ctx->types |= IOTCON_REQUEST_OBSERVE;
/* observation info*/
- req_ctx->observer_id = request->obsInfo.obsId;
+ req_ctx->observe_id = request->obsInfo.obsId;
req_ctx->observe_action = request->obsInfo.action;
}
break;
{
int ret;
int types;
- int observer_id;
- iotcon_observe_action_e observer_action;
+ int observe_id;
+ iotcon_observe_action_e observe_action;
ret = iotcon_request_get_types(request, &types);
if (IOTCON_ERROR_NONE != ret) {
}
if (IOTCON_REQUEST_OBSERVE & types) {
- ret = iotcon_request_get_observer_action(request, &observer_action);
+ ret = iotcon_request_get_observe_action(request, &observe_action);
if (IOTCON_ERROR_NONE != ret) {
return;
}
- if (IOTCON_OBSERVE_REGISTER == observer_action) {
- ret = iotcon_request_get_observer_id(request, &observer_id);
+ if (IOTCON_OBSERVE_REGISTER == observe_action) {
+ ret = iotcon_request_get_observe_id(request, &observe_id);
if (IOTCON_ERROR_NONE != ret) {
return;
}
- ret = iotcon_observers_add(observers, observer_id);
+ ret = iotcon_observers_add(observers, observe_id);
if (IOTCON_ERROR_NONE != ret) {
return;
}
- } else if (IOTCON_OBSERVE_DEREGISTER == observer_action) {
- ret = iotcon_request_get_observer_id(request, &observer_id);
+ } else if (IOTCON_OBSERVE_DEREGISTER == observe_action) {
+ ret = iotcon_request_get_observe_id(request, &observe_id);
if (IOTCON_ERROR_NONE != ret) {
return;
}
- ret = iotcon_observers_remove(observers, observer_id);
+ ret = iotcon_observers_remove(observers, observe_id);
if (IOTCON_ERROR_NONE != ret) {
return;
}
NULL, /* header options */
NULL, /* query */
NULL, /* observe action */
- NULL, /* observer_id */
+ NULL, /* observe_id */
&repr_iter,
&oic_request_h,
&oic_resource_h);
}
-API int iotcon_request_get_observer_action(iotcon_request_h request,
+API int iotcon_request_get_observe_action(iotcon_request_h request,
iotcon_observe_action_e *action)
{
RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
}
-API int iotcon_request_get_observer_id(iotcon_request_h request, int *observer_id)
+API int iotcon_request_get_observe_id(iotcon_request_h request, int *observe_id)
{
RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
- RETV_IF(NULL == observer_id, IOTCON_ERROR_INVALID_PARAMETER);
+ RETV_IF(NULL == observe_id, IOTCON_ERROR_INVALID_PARAMETER);
- *observer_id = request->observation_info.observer_id;
+ *observe_id = request->observation_info.observe_id;
return IOTCON_ERROR_NONE;
}
struct icl_observe_info {
iotcon_observe_action_e action;
- int observer_id;
+ int observe_id;
};
struct icl_resource_request {
&options,
&query,
&request.observation_info.action,
- &request.observation_info.observer_id,
+ &request.observation_info.observe_id,
&repr_iter,
&request.oic_request_h,
&request.oic_resource_h);
/* for iotcon_resource_notify */
if (IOTCON_REQUEST_OBSERVE & request.types) {
- int observer_id = request.observation_info.observer_id;
+ int observe_id = request.observation_info.observe_id;
if (IOTCON_OBSERVE_REGISTER == request.observation_info.action) {
if (NULL == resource->observers)
iotcon_observers_create(&resource->observers);
- iotcon_observers_add(resource->observers, observer_id);
+ iotcon_observers_add(resource->observers, observe_id);
} else if (IOTCON_OBSERVE_DEREGISTER == request.observation_info.action) {
- iotcon_observers_remove(resource->observers, observer_id);
+ iotcon_observers_remove(resource->observers, observe_id);
}
}
* @see iotcon_request_get_types()
* @see iotcon_request_get_options()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
*/
int iotcon_request_get_host_address(iotcon_request_h request,
char **host_address);
* @see iotcon_request_get_types()
* @see iotcon_request_get_options()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
*/
int iotcon_request_get_connectivity_type(iotcon_request_h request,
iotcon_connectivity_type_e *connectivity_type);
* @see iotcon_request_get_types()
* @see iotcon_request_get_options()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
*/
int iotcon_request_get_representation(iotcon_request_h request,
iotcon_representation_h *repr);
* @see iotcon_request_get_representation()
* @see iotcon_request_get_options()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
*/
int iotcon_request_get_types(iotcon_request_h request, int *types);
* @see iotcon_request_get_representation()
* @see iotcon_request_get_types()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
*/
int iotcon_request_get_options(iotcon_request_h request, iotcon_options_h *options);
* @see iotcon_request_get_representation()
* @see iotcon_request_get_types()
* @see iotcon_request_get_options()
- * @see iotcon_request_get_observer_action()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_action()
+ * @see iotcon_request_get_observe_id()
*/
int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query);
* @see iotcon_request_get_types()
* @see iotcon_request_get_options()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_id()
+ * @see iotcon_request_get_observe_id()
*/
-int iotcon_request_get_observer_action(iotcon_request_h request,
+int iotcon_request_get_observe_action(iotcon_request_h request,
iotcon_observe_action_e *action);
/**
* @since_tizen 3.0
*
* @param[in] request The handle of the request
- * @param[out] observer_id The id of the observer
+ * @param[out] observe_id The id of the observer
*
* @return 0 on success, otherwise a negative error value.
* @retval #IOTCON_ERROR_NONE Successful
* @see iotcon_request_get_types()
* @see iotcon_request_get_options()
* @see iotcon_request_get_query()
- * @see iotcon_request_get_observer_action()
+ * @see iotcon_request_get_observe_action()
*/
-int iotcon_request_get_observer_id(iotcon_request_h request, int *observer_id);
+int iotcon_request_get_observe_id(iotcon_request_h request, int *observe_id);
/**
* @}
door_resource_s *door;
iotcon_query_h query;
iotcon_response_h response = NULL;
- int ret, types, observer_id;
- iotcon_observe_action_e observer_action;
+ int ret, types, observe_id;
+ iotcon_observe_action_e observe_action;
char *host_address;
RET_IF(NULL == request);
INFO("host_address : %s", host_address);
if (IOTCON_REQUEST_OBSERVE & types) {
- ret = iotcon_request_get_observer_action(request, &observer_action);
+ ret = iotcon_request_get_observe_action(request, &observe_action);
if (IOTCON_ERROR_NONE != ret) {
- ERR("iotcon_request_get_observer_action() Fail(%d)", ret);
+ ERR("iotcon_request_get_observe_action() Fail(%d)", ret);
return;
}
- if (IOTCON_OBSERVE_REGISTER == observer_action) {
- ret = iotcon_request_get_observer_id(request, &observer_id);
+ if (IOTCON_OBSERVE_REGISTER == observe_action) {
+ ret = iotcon_request_get_observe_id(request, &observe_id);
if (IOTCON_ERROR_NONE != ret) {
- ERR("iotcon_request_get_observer_id() Fail(%d)", ret);
+ ERR("iotcon_request_get_observe_id() Fail(%d)", ret);
return;
}
- ret = iotcon_observers_add(door->observers, observer_id);
- } else if (IOTCON_OBSERVE_DEREGISTER == observer_action) {
- ret = iotcon_request_get_observer_id(request, &observer_id);
+ ret = iotcon_observers_add(door->observers, observe_id);
+ } else if (IOTCON_OBSERVE_DEREGISTER == observe_action) {
+ ret = iotcon_request_get_observe_id(request, &observe_id);
if (IOTCON_ERROR_NONE != ret) {
- ERR("iotcon_request_get_observer_id() Fail(%d)", ret);
+ ERR("iotcon_request_get_observe_id() Fail(%d)", ret);
return;
}
- ret = iotcon_observers_remove(door->observers, observer_id);
+ ret = iotcon_observers_remove(door->observers, observe_id);
if (IOTCON_ERROR_NONE != ret) {
ERR("iotcon_observers_remove() Fail(%d)", ret);
return;