[iotcon]add oring connectivity convert for find function

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

diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc
index 27e56c3..1166063 100644 (file)
--- a/src/iotcon/iotcon_instance.cc
+++ b/src/iotcon/iotcon_instance.cc
@@ -1267,7 +1267,7 @@ common::TizenResult IotconInstance::ClientFindResource(const picojson::object& a
   };
 
   CHECK_EXIST(args, kConnectivityType);
-  iotcon_connectivity_type_e connectivity_type = IotconUtils::ToConnectivityType(
+  int connectivity_type = IotconUtils::ToConnectivityType2(
       args.find(kConnectivityType)->second.get<std::string>());
 
   long long id = GetId(args);
@@ -1431,7 +1431,7 @@ common::TizenResult IotconInstance::ClientFindDeviceInfo(const picojson::object&
 
   CHECK_EXIST(args, kConnectivityType);
   std::string con_type = args.find(kConnectivityType)->second.get<std::string>();
-  iotcon_connectivity_type_e con_type_e = IotconUtils::ToConnectivityType(con_type);
+  int con_type_e = IotconUtils::ToConnectivityType2(con_type);
 
   long long id = GetId(args);
   auto response = [this, id](const common::TizenResult& res, const picojson::value& v) {
@@ -1528,7 +1528,7 @@ common::TizenResult IotconInstance::ClientFindPlatformInfo(const picojson::objec
 
   CHECK_EXIST(args, kConnectivityType);
   std::string con_type = args.find(kConnectivityType)->second.get<std::string>();
-  iotcon_connectivity_type_e con_type_e = IotconUtils::ToConnectivityType(con_type);
+  int con_type_e = IotconUtils::ToConnectivityType2(con_type);
 
   long long id = GetId(args);
   auto response = [this, id](const common::TizenResult& res, const picojson::value& v) {

diff --git a/src/iotcon/iotcon_utils.cc b/src/iotcon/iotcon_utils.cc
index 311590e..c94661f 100644 (file)
--- a/src/iotcon/iotcon_utils.cc
+++ b/src/iotcon/iotcon_utils.cc
@@ -2078,6 +2078,27 @@ iotcon_connectivity_type_e IotconUtils::ToConnectivityType(const std::string& e)
   IOTCON_CONNECTIVITY_TYPE_E
 }
 
+int IotconUtils::ToConnectivityType2(const std::string& connectivity_type) {
+  ScopeLogger();
+  int ret = IOTCON_CONNECTIVITY_ALL;
+  if (connectivity_type == "IP") {
+    ret = IOTCON_CONNECTIVITY_IP;
+  } else if (connectivity_type == "PREFER_UDP") {
+    ret = IOTCON_CONNECTIVITY_IP|IOTCON_CONNECTIVITY_PREFER_UDP;
+  } else if (connectivity_type == "PREFER_TCP") {
+    ret = IOTCON_CONNECTIVITY_IP|IOTCON_CONNECTIVITY_PREFER_TCP;
+  } else if (connectivity_type == "IPV4_ONLY") {
+    ret = IOTCON_CONNECTIVITY_IP|IOTCON_CONNECTIVITY_IPV4_ONLY|IOTCON_CONNECTIVITY_PREFER_UDP;
+  } else if (connectivity_type == "IPV6_ONLY") {
+    ret = IOTCON_CONNECTIVITY_IP|IOTCON_CONNECTIVITY_IPV6_ONLY|IOTCON_CONNECTIVITY_PREFER_UDP;
+  } else {
+    ret = IOTCON_CONNECTIVITY_ALL;
+  }
+
+   LoggerD("ToConnectivityType2: %s  ,%d", connectivity_type.c_str(), ret);
+   return ret;
+}
+
 iotcon_observe_policy_e IotconUtils::ToObservePolicy(const std::string& e) {
   ScopeLogger();
 

diff --git a/src/iotcon/iotcon_utils.h b/src/iotcon/iotcon_utils.h
index e6a1505..9252e9a 100644 (file)
--- a/src/iotcon/iotcon_utils.h
+++ b/src/iotcon/iotcon_utils.h
@@ -218,6 +218,7 @@ class IotconUtils {
   static std::string FromResponseResultType(iotcon_response_result_e e);
 
   static iotcon_connectivity_type_e ToConnectivityType(const std::string& e);
+  static int ToConnectivityType2(const std::string& e);
   static iotcon_observe_policy_e ToObservePolicy(const std::string& e);
   static iotcon_qos_e ToQos(const std::string& e);
   static iotcon_response_result_e ToResponseResult(const std::string& e);