[IotCon] Enable module in spec, make quick fixes for building iotcon

[Verification] Code compiles without errors.

Change-Id: I452ac6dbf4231866a49d813653a45057f275f5a6
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index d00125bd97e6c9f1ad4e2cf4264c46d0f9f3325a..0ca2d5c6366740ba88cb0c7751f8e245191caf81 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -116,7 +116,7 @@ Source0:    %{name}-%{version}.tar.gz
 %else
 %define tizen_feature_ham_support                     0
 %endif
-%define tizen_feature_iotcon_support                  0
+%define tizen_feature_iotcon_support                  1
 %define tizen_feature_location_batch                  0
 %define tizen_feature_key_manager_support             1
 %define tizen_feature_media_controller_support        1

diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc
index ba6725528e5b5e5dc5f1dde4558c205b72b8fdee..7e7b5fb6a1250fd650e150b6229c447f1ef1b3a4 100644 (file)
--- a/src/iotcon/iotcon_instance.cc
+++ b/src/iotcon/iotcon_instance.cc
@@ -85,6 +85,8 @@ const std::string kResult = "result";
 const std::string kTimeout = "timeout";
 const std::string kData = "data";
 
+const std::string kVirtualResourcesHandlingPath = "/home/tmp_file_iotcon.dat";
+
 }  // namespace
 
 IotconInstance::IotconInstance() {
@@ -135,7 +137,7 @@ IotconInstance::IotconInstance() {
 #undef REGISTER_ASYNC
 
   // initialize connection to iotcon service
-  int ret = iotcon_initialize();
+  int ret = iotcon_initialize(kVirtualResourcesHandlingPath.c_str());
   if (IOTCON_ERROR_NONE != ret) {
     LoggerE("Could not connnect to iotcon service: %s", get_error_message(ret));
   } else {
@@ -978,14 +980,14 @@ common::TizenResult IotconInstance::RemoteResourceUnsetConnectionChangeListener(
   return common::TizenSuccess{IotconClientManager::GetInstance().RemoveRemoteResource(ptr)};
 }
 
-void IotconInstance::ResourceFoundCallback(iotcon_remote_resource_h resource,
+bool IotconInstance::ResourceFoundCallback(iotcon_remote_resource_h resource,
                                            iotcon_error_e result, void *user_data) {
   ScopeLogger();
   CallbackData* data = static_cast<CallbackData*>(user_data);
   auto ret = IotconUtils::ConvertIotconError(result);
   if (!ret) {
     data->fun(ret, picojson::value{});
-    return;
+    return IOTCON_FUNC_STOP;
   }
 
   picojson::value json_result = picojson::value(picojson::object());
@@ -993,9 +995,11 @@ void IotconInstance::ResourceFoundCallback(iotcon_remote_resource_h resource,
   ret = IotconUtils::RemoteResourceToJson(resource, &(json_result.get<picojson::object>()));
   if (!ret) {
     data->fun(ret, picojson::value{});
-    return;
+    return IOTCON_FUNC_STOP;
   }
   data->fun(ret, json_result);
+
+  return IOTCON_FUNC_STOP;
 }
 
 common::TizenResult IotconInstance::ClientFindResource(const picojson::object& args) {
@@ -1128,7 +1132,7 @@ common::TizenResult IotconInstance::ClientRemovePresenceEventListener(const pico
   return common::TizenSuccess();
 }
 
-void IotconDeviceInfoCb(iotcon_device_info_h device_info,
+bool IotconDeviceInfoCb(iotcon_device_info_h device_info,
                           iotcon_error_e result, void *user_data) {
   ScopeLogger();
 
@@ -1144,6 +1148,8 @@ void IotconDeviceInfoCb(iotcon_device_info_h device_info,
 
   data->fun(ret, v);
   delete data;
+
+  return IOTCON_FUNC_STOP;
 }
 
 common::TizenResult IotconInstance::ClientGetDeviceInfo(const picojson::object& args,
@@ -1173,7 +1179,7 @@ common::TizenResult IotconInstance::ClientGetDeviceInfo(const picojson::object&
   return common::TizenSuccess();
 }
 
-void IotconPlatformInfoCb(iotcon_platform_info_h platform_info,
+bool IotconPlatformInfoCb(iotcon_platform_info_h platform_info,
                           iotcon_error_e result, void *user_data) {
   ScopeLogger();
 
@@ -1189,6 +1195,8 @@ void IotconPlatformInfoCb(iotcon_platform_info_h platform_info,
 
   data->fun(ret, v);
   delete data;
+
+  return IOTCON_FUNC_STOP;
 }
 
 common::TizenResult IotconInstance::ClientGetPlatformInfo(const picojson::object& args,

diff --git a/src/iotcon/iotcon_instance.h b/src/iotcon/iotcon_instance.h
index 528abdb9ebb8adfffa70d1d1d6219fea36f95a9e..5af4f6ffa89597fdc52714772cd95c9b7260828a 100644 (file)
--- a/src/iotcon/iotcon_instance.h
+++ b/src/iotcon/iotcon_instance.h
@@ -32,7 +32,7 @@ class IotconInstance : public common::TizenInstance {
   virtual ~IotconInstance();
  private:
   static void ConnectionChangedCallback(bool is_connected, void* user_data);
-  static void ResourceFoundCallback(iotcon_remote_resource_h resource,
+  static bool ResourceFoundCallback(iotcon_remote_resource_h resource,
                                     iotcon_error_e result, void *user_data);
 
   common::TizenResult ResourceGetObserverIds(const picojson::object& args);

diff --git a/src/iotcon/iotcon_utils.cc b/src/iotcon/iotcon_utils.cc
index dbf4d0e7869c6cd597dfc872281125541e52901a..4edc261b312fcf57710c18d4b0584e01ad8bf27d 100644 (file)
--- a/src/iotcon/iotcon_utils.cc
+++ b/src/iotcon/iotcon_utils.cc
@@ -286,7 +286,7 @@ TizenResult IotconUtils::ExtractFromResource(const ResourceInfoPtr& pointer,
                                              char** uri_path,
                                              iotcon_resource_types_h* res_types,
                                              iotcon_resource_interfaces_h* ifaces,
-                                             int* properties) {
+                                             uint8_t* properties) {
   ScopeLogger();
 
   auto result = ConvertIotconError(iotcon_resource_get_uri_path(pointer->handle, uri_path));
@@ -318,7 +318,7 @@ TizenResult IotconUtils::ResourceToJson(ResourceInfoPtr pointer,
   char* uri_path = nullptr;
   iotcon_resource_types_h res_types = nullptr;
   iotcon_resource_interfaces_h ifaces = nullptr;
-  int properties = 0;
+  uint8_t properties = 0;
   auto ret = ExtractFromResource(pointer, &uri_path, &res_types, &ifaces, &properties);
   if (!ret){
     return ret;

diff --git a/src/iotcon/iotcon_utils.h b/src/iotcon/iotcon_utils.h
index 42d9c064c96551740f8e052a9843a82e3a55ca8b..f9464191e00e87e866c0801c2daa2f31acc49440 100644 (file)
--- a/src/iotcon/iotcon_utils.h
+++ b/src/iotcon/iotcon_utils.h
@@ -98,7 +98,7 @@ struct RemoteResourceInfo {
   char* device_id;
   iotcon_resource_types_h types;
   iotcon_resource_interfaces_h ifaces;
-  int properties;  // to check if observable
+  uint8_t properties;  // to check if observable
   iotcon_options_h options;
   iotcon_representation_h representation;
   RemoteResourceInfo() :
@@ -144,7 +144,7 @@ class IotconUtils {
                                                  char** uri_path,
                                                  iotcon_resource_types_h* res_types,
                                                  iotcon_resource_interfaces_h* ifaces,
-                                                 int* properties);
+                                                 uint8_t* properties);
   static common::TizenResult ResourceToJson(ResourceInfoPtr pointer,
                                             picojson::object* res);
   static common::TizenResult ExtractFromRemoteResource(RemoteResourceInfo* resource);