adopt the iovitiy 1.2.1.

 - change platfrom/device payload to representaion paylod

Change-Id: I0cc829d5f70366be8f244190bb2dcc3240ff90be

5 files changed, 40 insertions, 40 deletions

diff --git a/src/ic-ioty-ocprocess.c b/src/ic-ioty-ocprocess.c
index f3a390a..a35c3dd 100644
--- a/src/ic-ioty-ocprocess.c
+++ b/src/ic-ioty-ocprocess.c
@@ -276,12 +276,12 @@ OCStackApplicationResult icl_ioty_ocprocess_device_info_cb(void *ctx,
 			"No Authorization");
 	RETV_IF(NULL == resp->payload, OC_STACK_KEEP_TRANSACTION);
 
-	if (PAYLOAD_TYPE_DEVICE != resp->payload->type) {
+	if (PAYLOAD_TYPE_REPRESENTATION != resp->payload->type) {
 		ERR("Invalid payload type (%d)", resp->payload->type);
 		return OC_STACK_KEEP_TRANSACTION;
 	}
 
-	ret = ic_ioty_parse_oic_device_payload((OCDevicePayload *)resp->payload,
+	ret = ic_ioty_parse_oic_device_payload((OCRepPayload *)resp->payload,
 			&info);
 	if (IOTCON_ERROR_NONE != ret) {
 		ERR("ic_ioty_parse_oic_device_payload() Fail(%d)", ret);
@@ -351,12 +351,12 @@ OCStackApplicationResult icl_ioty_ocprocess_platform_info_cb(void *ctx,
 			"No Authorization");
 	RETV_IF(NULL == resp->payload, OC_STACK_KEEP_TRANSACTION);
 
-	if (PAYLOAD_TYPE_PLATFORM != resp->payload->type) {
+	if (PAYLOAD_TYPE_REPRESENTATION != resp->payload->type) {
 		ERR("Invalid payload type (%d)", resp->payload->type);
 		return OC_STACK_KEEP_TRANSACTION;
 	}
 
-	ret = ic_ioty_parse_oic_platform_payload((OCPlatformPayload *)resp->payload,
+	ret = ic_ioty_parse_oic_platform_payload((OCRepPayload *)resp->payload,
 			&info);
 	if (IOTCON_ERROR_NONE != ret) {
 		ERR("ic_ioty_parse_oic_platform_payload() Fail(%d)", ret);
@@ -413,6 +413,8 @@ OCStackApplicationResult icl_ioty_ocprocess_presence_cb(void *ctx,
 	RETV_IF(NULL == resp, OC_STACK_KEEP_TRANSACTION);
 	RETV_IF(NULL == presence, OC_STACK_KEEP_TRANSACTION);
 
+	DBG("presence->handle:[%p] vs handle:[%p]", presence->handle, handle);
+
 	ret = ic_ioty_parse_oic_presence_payload(&resp->devAddr,
 			(OCPresencePayload*)resp->payload, resp->result, &presence_response);
 	if (IOTCON_ERROR_NONE != ret) {
@@ -884,7 +886,7 @@ OCEntityHandlerResult icl_ioty_ocprocess_lite_request_cb(OCEntityHandlerFlag fla
 		g_idle_add(_icl_ioty_ocprocess_lite_resource_response_idle_cb, res);
 		break;
 	case IOTCON_REQUEST_POST:
-		if(NULL == repr) {
+		if (NULL == repr) {
 			ERR("repr is NULL!!");
 			break;
 		}
diff --git a/src/ic-ioty-parse.c b/src/ic-ioty-parse.c
index f80395f..a60b58b 100644
--- a/src/ic-ioty-parse.c
+++ b/src/ic-ioty-parse.c
@@ -437,10 +437,13 @@ int ic_ioty_parse_oic_discovery_payload(OCDevAddr *dev_addr,
 	return IOTCON_ERROR_NONE;
 }
 
-int ic_ioty_parse_oic_device_payload(OCDevicePayload *payload,
+int ic_ioty_parse_oic_device_payload(OCRepPayload *payload,
 		iotcon_device_info_h *device_info)
 {
+	FN_CALL;
 	struct icl_device_info *info = NULL;
+	char **dmv = NULL;
+	size_t dim[MAX_REP_ARRAY_DEPTH] = {1, 0, 0};
 
 	RETV_IF(NULL == device_info, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -450,23 +453,24 @@ int ic_ioty_parse_oic_device_payload(OCDevicePayload *payload,
 		return IOTCON_ERROR_OUT_OF_MEMORY;
 	}
 
-	if (payload->deviceName)
-		info->device_name = strdup(payload->deviceName);
-	else
-		info->device_name = strdup("");
-	if (NULL == info->device_name)
-		ERR("strdup(device_name) Fail(%d)", errno);
-
-	info->spec_ver = ic_utils_strdup(payload->specVersion);
-	info->device_id = ic_utils_strdup(payload->sid);
-	info->data_model_ver = OCCreateString(payload->dataModelVersions);
+	OCRepPayloadGetPropString(payload, OC_RSRVD_DEVICE_NAME, &(info->device_name));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_SPEC_VERSION, &(info->spec_ver));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_DEVICE_ID, &(info->device_id));
+	OCRepPayloadGetStringArray(payload, OC_RSRVD_DATA_MODEL_VERSION, &dmv, dim);
+	if (dmv) {
+		if (dmv[0]) {
+			info->data_model_ver = ic_utils_strdup(dmv[0]);
+			free(dmv[0]);
+		}
+		free(dmv);
+	}
 
 	*device_info = info;
 
 	return IOTCON_ERROR_NONE;
 }
 
-int ic_ioty_parse_oic_platform_payload(OCPlatformPayload *payload,
+int ic_ioty_parse_oic_platform_payload(OCRepPayload *payload,
 		iotcon_platform_info_h *platform_info)
 {
 	struct icl_platform_info *info = NULL;
@@ -480,26 +484,17 @@ int ic_ioty_parse_oic_platform_payload(OCPlatformPayload *payload,
 		return IOTCON_ERROR_OUT_OF_MEMORY;
 	}
 
-	info->platform_id  = ic_utils_strdup(payload->info.platformID);
-	info->manuf_name = ic_utils_strdup(payload->info.manufacturerName);
-	if (payload->info.manufacturerUrl)
-		info->manuf_url = ic_utils_strdup(payload->info.manufacturerUrl);
-	if (payload->info.modelNumber)
-		info->model_number = ic_utils_strdup(payload->info.modelNumber);
-	if (payload->info.dateOfManufacture)
-		info->date_of_manuf = ic_utils_strdup(payload->info.dateOfManufacture);
-	if (payload->info.platformVersion)
-		info->platform_ver = ic_utils_strdup(payload->info.platformVersion);
-	if (payload->info.operatingSystemVersion)
-		info->os_ver = ic_utils_strdup(payload->info.operatingSystemVersion);
-	if (payload->info.hardwareVersion)
-		info->hardware_ver = ic_utils_strdup(payload->info.hardwareVersion);
-	if (payload->info.firmwareVersion)
-		info->firmware_ver = ic_utils_strdup(payload->info.firmwareVersion);
-	if (payload->info.supportUrl)
-		info->support_url = ic_utils_strdup(payload->info.supportUrl);
-	if (payload->info.systemTime)
-		info->system_time = ic_utils_strdup(payload->info.systemTime);
+	OCRepPayloadGetPropString(payload, OC_RSRVD_PLATFORM_ID, &(info->platform_id));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_MFG_NAME, &(info->manuf_name));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_MFG_URL, &(info->manuf_url));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_MODEL_NUM, &(info->model_number));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_MFG_DATE, &(info->date_of_manuf));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_PLATFORM_VERSION, &(info->platform_ver));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_OS_VERSION, &(info->os_ver));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_HARDWARE_VERSION, &(info->hardware_ver));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_FIRMWARE_VERSION, &(info->firmware_ver));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_SUPPORT_URL, &(info->support_url));
+	OCRepPayloadGetPropString(payload, OC_RSRVD_SYSTEM_TIME, &(info->system_time));
 
 	*platform_info = info;
 
diff --git a/src/ic-ioty-parse.h b/src/ic-ioty-parse.h
index 0fb0753..3f42f6d 100644
--- a/src/ic-ioty-parse.h
+++ b/src/ic-ioty-parse.h
@@ -38,9 +38,9 @@ int ic_ioty_parse_oic_discovery_payload(OCDevAddr *dev_addr,
 		int connectivity_prefer,
 		OCDiscoveryPayload *discovered,
 		GList **resource_list);
-int ic_ioty_parse_oic_device_payload(OCDevicePayload *payload,
+int ic_ioty_parse_oic_device_payload(OCRepPayload *payload,
 		iotcon_device_info_h *device_info);
-int ic_ioty_parse_oic_platform_payload(OCPlatformPayload *payload,
+int ic_ioty_parse_oic_platform_payload(OCRepPayload *payload,
 		iotcon_platform_info_h *platform_info);
 int ic_ioty_parse_oic_presence_payload(OCDevAddr *dev_addr,
 		OCPresencePayload *payload,
diff --git a/src/ic-ioty.c b/src/ic-ioty.c
index 7678924..f5b74c7 100644
--- a/src/ic-ioty.c
+++ b/src/ic-ioty.c
@@ -797,6 +797,7 @@ int icl_ioty_add_presence_cb(const char *host_address,
 	ret = OCDoResource(&handle, OC_REST_PRESENCE, uri, NULL, NULL, oic_conn_type,
 			OC_LOW_QOS, &cbdata, NULL, 0);
 	}
+	DBG("handle:[%p]", handle);
 
 	icl_ioty_mutex_unlock();
 	presence->handle = handle;
@@ -823,6 +824,8 @@ int icl_ioty_remove_presence_cb(iotcon_presence_h presence)
 		ERR("icl_ioty_mutex_lock() Fail(%d)", ret);
 		return ret;
 	}
+
+	DBG("presence_handle->handle:[%p]", presence->handle);
 	ret = OCCancel(presence->handle, OC_LOW_QOS, NULL, 0);
 	icl_ioty_mutex_unlock();
 
diff --git a/src/ic-provisioning.c b/src/ic-provisioning.c
index 92a4555..ee50147 100644
--- a/src/ic-provisioning.c
+++ b/src/ic-provisioning.c
@@ -180,7 +180,7 @@ static void _provisioning_input_pin_cb(char *pin, size_t len)
 
 	RET_IF(NULL == icl_randompin_cb_container.cb);
 	RET_IF(NULL == pin);
-	RET_IF(len <= OXM_RANDOM_PIN_SIZE);
+	RET_IF(len <= OXM_RANDOM_PIN_MAX_SIZE);
 
 	temp = icl_randompin_cb_container.cb(icl_randompin_cb_container.user_data);
 	if ((NULL == temp) || (len <= strlen(temp))) {