From: sung.goo.kim <sung.goo.kim@samsung.com>
Date: Tue, 28 Jun 2016 06:42:42 +0000 (+0900)
Subject: Modify platform_id from tizen_id to device_name(tizen_id)
X-Git-Tag: submit/tizen/20160628.100126~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e7a2da7cda40da13819e890ad8ccc75544f6c20;p=platform%2Fcore%2Fiot%2Fiotcon.git

Modify platform_id from tizen_id to device_name(tizen_id)

Change-Id: I0882ff091a188bd62f615f28d334c19b1638cbb2
---

diff --git a/common/ic-utils.c b/common/ic-utils.c
index 141dc71..415bc6b 100644
--- a/common/ic-utils.c
+++ b/common/ic-utils.c
@@ -29,7 +29,6 @@
 #include "ic-log.h"
 #include "ic-utils.h"
 
-
 #ifdef TZ_VER_3
 static int _ic_ocf_feature = -1;
 static const char *IC_FEATURE_OCF = "http://tizen.org/feature/iot.ocf";
@@ -169,17 +168,26 @@ void ic_utils_free_platform_info(OCPlatformInfo *platform_info)
 int ic_utils_get_platform_info(OCPlatformInfo *platform_info)
 {
 	int ret;
+	char *tizen_id = NULL;
+	char *device_name = NULL;
+	char platform_id[1024];
 
 	RETV_IF(NULL == platform_info, IOTCON_ERROR_INVALID_PARAMETER);
 
+	ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_DEVICE_NAME, &device_name);
+	WARN_IF(SYSTEM_SETTINGS_ERROR_NONE != ret,
+			"system_settings_get_value_string() Fail(%d)", ret);
+	ret = system_info_get_platform_string(IC_SYSTEM_INFO_TIZEN_ID, &tizen_id);
+	WARN_IF(SYSTEM_INFO_ERROR_NONE != ret, "system_info_get_platform_string() Fail(%d)",
+			ret);
+	snprintf(platform_id, sizeof(platform_id), "%s(%s)", IC_SAFE_STR(device_name),
+			IC_SAFE_STR(tizen_id));
+	free(device_name);
+	free(tizen_id);
+	SECURE_DBG("platform_id: %s", platform_id);
+
 	/* Mandatory (oic.wk.p) */
-	ret = system_info_get_platform_string(IC_SYSTEM_INFO_TIZEN_ID,
-			&platform_info->platformID);
-	if (SYSTEM_INFO_ERROR_NONE != ret) {
-		ERR("system_info_get_platform_string(tizen_id) Fail(%d)", ret);
-		ic_utils_free_platform_info(platform_info);
-		return IOTCON_ERROR_SYSTEM;
-	}
+	platform_info->platformID = strdup(platform_id);
 
 	/* Mandatory (oic.wk.p) */
 	ret = system_info_get_platform_string(IC_SYSTEM_INFO_MANUF_NAME,
diff --git a/common/ic-utils.h b/common/ic-utils.h
index 671f9f8..82d16d6 100644
--- a/common/ic-utils.h
+++ b/common/ic-utils.h
@@ -20,6 +20,7 @@
 #include "iotcon-types.h"
 
 #define IC_EQUAL 0
+#define IC_SAFE_STR(str) ((str)?str:"")
 
 enum {
 	IC_PERMISSION_NETWORK_GET = (1 << 0),