[Iotcon] apply widl modification

1.Update ConnectivityType to match native enum
2.Move deviceName attribute from Server to tizen.iotcon

Change-Id: Ifa85ecbee5b386455cb321456caa14361060ab0c
Signed-off-by: jk.pu <jk.pu@samsung.com>

diff --git a/src/iotcon/iotcon_api.js b/src/iotcon/iotcon_api.js
index ad4b7e28c59c87c0894cd3f7fd008f12ffb926aa..c8ea786290ceece0c6d124eb16b1f77508f0355c 100644 (file)
--- a/src/iotcon/iotcon_api.js
+++ b/src/iotcon/iotcon_api.js
@@ -150,10 +150,11 @@ var PresenceTriggerType = {
 };
 
 var ConnectivityType = {
-  IPV4: 'IPV4',
-  IPV6: 'IPV6',
-  BT_EDR: 'BT_EDR',
-  BT_LE: 'BT_LE',
+  IP: "IP",
+  PREFER_UDP: "PREFER_UDP",
+  PREFER_TCP: "PREFER_TCP",
+  IPV4_ONLY: "IPV4_ONLY",
+  IPV6_ONLY: "IPV6_ONLY",
   ALL: 'ALL'
 };
 
@@ -1202,31 +1203,6 @@ Client.prototype.findPlatformInfo = function() {
 };
 
 function Server() {
-  // TODO The variable _deviceName will be removed when the native function for getting device name is ready
-  var _deviceName = '';
-
-  Object.defineProperties(this, {
-    deviceName: {
-      get: function() {
-        return _deviceName;
-      },
-      set: function(v) {
-        if (v) {
-          var deviceName = v;
-
-          var callArgs = {
-            deviceName: deviceName
-          };
-
-          var result = native.callSync('IotconServer_setDeviceName', callArgs);
-          if (native.isSuccess(result)) {
-            _deviceName = deviceName;
-          }
-        }
-      },
-      enumerable: true
-    }
-  });
 }
 
 var serverResources = {};
@@ -1331,6 +1307,30 @@ var client = new Client();
 var server = new Server();
 
 function Iotcon() {
+  var _deviceName = '';
+
+  Object.defineProperties(this, {
+    deviceName: {
+      get: function() {
+        return _deviceName;
+      },
+      set: function(v) {
+        if (v) {
+          var deviceName = v;
+
+          var callArgs = {
+            deviceName: deviceName
+          };
+
+          var result = native.callSync('Iotcon_setDeviceName', callArgs);
+          if (native.isSuccess(result)) {
+            _deviceName = deviceName;
+          }
+        }
+      },
+      enumerable: true
+    }
+  });
 }
 
 Iotcon.prototype.initialize = function() {

diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc
index 872d31453d961c7fafee81fe4925262b147d3838..41aa17e0bdfc0557a14dd0a7d47ac8470c2d7620 100644 (file)
--- a/src/iotcon/iotcon_instance.cc
+++ b/src/iotcon/iotcon_instance.cc
@@ -135,7 +135,7 @@ IotconInstance::IotconInstance() : initialized_(false), presence_started_(false)
   REGISTER_SYNC("IotconServer_removeResource", ServerRemoveResource);
   REGISTER_SYNC("IotconServer_startPresence", ServerStartPresence);
   REGISTER_SYNC("IotconServer_stopPresence", ServerStopPresence);
-  REGISTER_SYNC("IotconServer_setDeviceName", ServerSetDeviceName);
+  REGISTER_SYNC("Iotcon_setDeviceName", SetDeviceName);
   REGISTER_SYNC("IotconClient_findResource", ClientFindResource);
 
 #undef REGISTER_SYNC
@@ -1553,7 +1553,7 @@ common::TizenResult IotconInstance::ServerStopPresence(const picojson::object& a
   return result;
 }
 
-common::TizenResult IotconInstance::ServerSetDeviceName(const picojson::object& args) {
+common::TizenResult IotconInstance::SetDeviceName(const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);

diff --git a/src/iotcon/iotcon_instance.h b/src/iotcon/iotcon_instance.h
index 7e2070c05a20e85fd50174bdf38e09dd3eafa880..4a0201b9120b3722c4dd23c5faac12eaa5151909 100644 (file)
--- a/src/iotcon/iotcon_instance.h
+++ b/src/iotcon/iotcon_instance.h
@@ -74,7 +74,7 @@ class IotconInstance : public common::TizenInstance {
   common::TizenResult ServerRemoveResource(const picojson::object& args);
   common::TizenResult ServerStartPresence(const picojson::object& args);
   common::TizenResult ServerStopPresence(const picojson::object& args);
-  common::TizenResult ServerSetDeviceName(const picojson::object& args);
+  common::TizenResult SetDeviceName(const picojson::object& args);
   common::TizenResult Initialize(const picojson::object& args);
   common::TizenResult GetTimeout(const picojson::object& args);
   common::TizenResult SetTimeout(const picojson::object& args);

diff --git a/src/iotcon/iotcon_utils.cc b/src/iotcon/iotcon_utils.cc
index 96240497eecff6324e19b2168d297b4966740f41..311590ee78c82ab2b881c276954b7e401fab9ca0 100644 (file)
--- a/src/iotcon/iotcon_utils.cc
+++ b/src/iotcon/iotcon_utils.cc
@@ -32,8 +32,11 @@ namespace iotcon {
 namespace {
 
 #define IOTCON_CONNECTIVITY_TYPE_E \
-  X(IOTCON_CONNECTIVITY_IPV4, "IPV4") \
-  X(IOTCON_CONNECTIVITY_IPV6, "IPV6") \
+  X(IOTCON_CONNECTIVITY_IP, "IP") \
+  X(IOTCON_CONNECTIVITY_PREFER_UDP, "PREFER_UDP") \
+  X(IOTCON_CONNECTIVITY_PREFER_TCP, "PREFER_TCP") \
+  X(IOTCON_CONNECTIVITY_IPV4_ONLY, "IPV4_ONLY") \
+  X(IOTCON_CONNECTIVITY_IPV6_ONLY, "IPV6_ONLY") \
   X(IOTCON_CONNECTIVITY_ALL, "ALL") \
   XD(IOTCON_CONNECTIVITY_ALL, "unknown")
 
@@ -581,7 +584,7 @@ common::TizenResult IotconUtils::RequestToJson(iotcon_request_h request,
 
     {
       // connectivityType
-      iotcon_connectivity_type_e connectivity_type = IOTCON_CONNECTIVITY_ALL;
+      iotcon_connectivity_type_e connectivity_type;
       auto result = ConvertIotconError(iotcon_request_get_connectivity_type(request, &connectivity_type));
       if (!result) {
         LogAndReturnTizenError(result, ("iotcon_request_get_connectivity_type() failed"));
@@ -1533,7 +1536,7 @@ common::TizenResult IotconUtils::PresenceResponseToJson(
 
     {
       // connectivityType
-      iotcon_connectivity_type_e con_type = IOTCON_CONNECTIVITY_IPV4;
+      iotcon_connectivity_type_e con_type;
       auto result = ConvertIotconError(iotcon_presence_response_get_connectivity_type(presence,
                                                                                       &con_type));
       if (!result) {