Fixed problem that not to find peers in the network

Unless applying this patch, it is not impossible to find peers in the
network due to the wrong comparison method.

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index 3bc8e60..efa254c 100644 (file)
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -28,6 +28,7 @@ INSTALL(
         PATTERN "include/*.h"
         )
 
+SET(PC_NAME ${CAPI_MDG})
 SET(PC_REQUIRED capi-base-common)
 SET(PC_LDFLAGS -l${CAPI_MDG})
 

diff --git a/capi/include/mdg.h b/capi/include/mdg.h
index 140957d..366d7e9 100644 (file)
--- a/capi/include/mdg.h
+++ b/capi/include/mdg.h
@@ -41,7 +41,7 @@ extern "C" {
 typedef void *mdg_h;
 
 /**
- * @brief Base error codes for cmdgd.
+ * @brief Base error codes for mdg-manager.
  *
  * @since_tizen 5.0
  */
@@ -50,7 +50,7 @@ typedef void *mdg_h;
 #endif
 
 /**
- * @brief Error codes for cmdgd.
+ * @brief Error codes for mdg-manager.
  *
  * @since_tizen 5.0
  */
@@ -105,7 +105,7 @@ typedef void *mdg_group_h; /**< Group handle */
  */
 
 /**
- * @brief Initializes cmdgd.
+ * @brief Initializes mdg-manager.
  * @since_tizen 5.0
  * @privlevel public
  * @privilege %http://tizen.org/privilege/internet
@@ -124,7 +124,7 @@ typedef void *mdg_group_h; /**< Group handle */
 int mdg_initialize(mdg_h *handle);
 
 /**
- * @brief Deinitializes the cmdgd.
+ * @brief Deinitializes the mdg-manager.
  * @since_tizen 5.0
  * @privlevel public
  * @privilege %http://tizen.org/privilege/internet
@@ -259,7 +259,7 @@ int mdg_group_get_found_groups(mdg_h handle,
 
 /**
  * @brief Creates a group.
- * @details This function is to allocate new group in local cmdgd.
+ * @details This function is to allocate new group in local mdg-manager.
  *
  * @since_tizen 5.0
  * @privlevel public
@@ -866,7 +866,6 @@ typedef enum {
        MDG_DEVICE_REMOVED = 1, /**< Device Removed */
 } mdg_device_status_e;
 
-
 /**
  * @brief Called after mdg_device_find().
  * @details This function can receive a device found.
@@ -953,7 +952,6 @@ typedef void (*mdg_device_send_data_finish_cb)(int result, char *resp_data,
 typedef void (*mdg_device_monitor_result_cb)(char *uuid, char *group_name,
                                        mdg_device_status_e status, void *user_data);
 
-
 /**
  * @brief Finds candidate devices to include my groups in the network.
  * @details This function will search for candidate devices that can be included in local group.

diff --git a/capi/src/mdg_dbus.c b/capi/src/mdg_dbus.c
index f6c9ab7..fe7b757 100644 (file)
--- a/capi/src/mdg_dbus.c
+++ b/capi/src/mdg_dbus.c
@@ -29,9 +29,9 @@
 #include <mdg_gdbus.h>
 #include <mdg_private.h>
 
-#define COMP_DBUS_SERVICE "org.tizen.mdg" /**< For multi device group manager dbus */
-#define COMP_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group dbus */
-#define COMP_DBUS_ENABLER_PATH "/org/tizen/mdg/enabler" /**< dbus auto-activation */
+#define MDG_DBUS_SERVICE "org.tizen.mdg" /**< For mdg dbus */
+#define MDG_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group dbus */
+#define MDG_DBUS_ENABLER_PATH "/org/tizen/mdg/enabler" /**< dbus auto-activation */
 
 /* LCOV_EXCL_START */
 static void __group_found_cb(Group *object, GVariant *va, gpointer user_data)
@@ -332,8 +332,8 @@ static int _enabler_proxy_init(mdg_manager_s *handle)
        int ret;
 
        handle->enabler_proxy = enabler_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-                                                  G_DBUS_PROXY_FLAGS_NONE, COMP_DBUS_SERVICE,
-                                                  COMP_DBUS_ENABLER_PATH, NULL, &error);
+                                                  G_DBUS_PROXY_FLAGS_NONE, MDG_DBUS_SERVICE,
+                                                  MDG_DBUS_ENABLER_PATH, NULL, &error);
        if (NULL == handle->enabler_proxy) {
                /* LCOV_EXCL_START */
                if (error != NULL) {
@@ -396,8 +396,8 @@ static int _group_proxy_init(mdg_manager_s *handle)
        handle->group_proxy = group_proxy_new_for_bus_sync(
                                        G_BUS_TYPE_SYSTEM,
                                        G_DBUS_PROXY_FLAGS_NONE,
-                                       COMP_DBUS_SERVICE,
-                                       COMP_DBUS_GROUP_PATH,
+                                       MDG_DBUS_SERVICE,
+                                       MDG_DBUS_GROUP_PATH,
                                        NULL,
                                        &error);
        if (NULL == handle->group_proxy) {

diff --git a/capi/src/mdg_private.h b/capi/src/mdg_private.h
index 1d22168..e4ccfd6 100644 (file)
--- a/capi/src/mdg_private.h
+++ b/capi/src/mdg_private.h
@@ -39,7 +39,7 @@
        bool mdg_supported = FALSE; \
        if (!system_info_get_platform_bool(feature_name, &mdg_supported)) { \
                if (mdg_supported == FALSE) { \
-                       _ERR("Multi Device Group Manager feature is disabled"); \
+                       _WARN("Multi Device Group Manager feature is disabled"); \
                        return MDG_ERROR_NOT_SUPPORTED; \
                } \
        } else { \
@@ -49,7 +49,7 @@
 }
 #else
 #define CHECK_FEATURE_SUPPORTED(feature_name) { \
-               _ERR("[Feature] Should be check !"); \
+               _WARN("[Feature] Should be check !"); \
        }
 #endif
 
@@ -153,7 +153,7 @@ typedef struct _monitor_result_cb_t {
 } monitor_result_cb_t;
 
 /**
- * @brief The cmdgd context
+ * @brief The mdg-manager context
  * @since_tizen 5.0
  */
 typedef struct _mdg_manager_s {

diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec
old mode 100644 (file)
new mode 100755 (executable)
index 3c8c0cd..52d06a7
--- a/packaging/d2d-manager.spec
+++ b/packaging/d2d-manager.spec
@@ -122,7 +122,7 @@ rm -rf %{NETWORK_FW_DATADIR}/*.db-journal
 %attr(644,root,root) %{_unitdir}/mdgd.service
 %attr(644,root,root) %{_unitdir}/ma.service
 %attr(644,network_fw,network_fw) %{NETWORK_FW_DATADIR}/oic_svr_db_ma.dat
-%attr(644,network_fw,network_fw) %{NETWORK_FW_DATADIR}/oic_svr_db_mdg_manager.dat
+%attr(644,network_fw,network_fw) %{NETWORK_FW_DATADIR}/oic_svr_db_mdgd_manager.dat
 
 %files devel
 %manifest %{name}-devel.manifest

diff --git a/src/mdg-manager/CMakeLists.txt b/src/mdg-manager/CMakeLists.txt
index ef76120..a641216 100644 (file)
--- a/src/mdg-manager/CMakeLists.txt
+++ b/src/mdg-manager/CMakeLists.txt
@@ -1,5 +1,5 @@
 MESSAGE("===================================================================")
-MESSAGE("Building...mdg-manager")
+MESSAGE("Building...mdgd")
 MESSAGE("===================================================================")
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -13,10 +13,10 @@ EXEC_PROGRAM(${GDBUS_CODEGEN} ARGS
                 ")
 
 MESSAGE(" - Set source folder")
-FILE(GLOB MDG_MANAGER_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
+FILE(GLOB MDGD_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 
-SET(MDG_MANAGER "mdgd")
-ADD_EXECUTABLE(${MDG_MANAGER} ${MDG_MANAGER_SRCS})
-TARGET_LINK_LIBRARIES(${MDG_MANAGER} ${daemon_pkgs_LIBRARIES} pthread)
-INSTALL(TARGETS ${MDG_MANAGER} DESTINATION bin)
-INSTALL(FILES oic_svr_db_mdg_manager.dat DESTINATION ${NETWORK_FW_DATADIR})
+SET(MDGD "mdgd")
+ADD_EXECUTABLE(${MDGD} ${MDGD_SRCS})
+TARGET_LINK_LIBRARIES(${MDGD} ${daemon_pkgs_LIBRARIES} pthread)
+INSTALL(TARGETS ${MDGD} DESTINATION bin)
+INSTALL(FILES oic_svr_db_mdgd_manager.dat DESTINATION ${NETWORK_FW_DATADIR})

diff --git a/src/mdg-manager/include/mdgd_enum.h b/src/mdg-manager/include/mdgd_enum.h
index b8c3b94..2420a13 100644 (file)
--- a/src/mdg-manager/include/mdgd_enum.h
+++ b/src/mdg-manager/include/mdgd_enum.h
@@ -25,7 +25,7 @@
 #define TIZEN_ERROR_COMP 0 /**< Same one */
 
 /**
- * @brief Error codes for cmdgd.
+ * @brief Error codes for mdg-manager.
  *
  * @since_tizen 5.0
  */

diff --git a/src/mdg-manager/include/mdgd_gdbus.h b/src/mdg-manager/include/mdgd_gdbus.h
index 4299f15..bc22f0d 100644 (file)
--- a/src/mdg-manager/include/mdgd_gdbus.h
+++ b/src/mdg-manager/include/mdgd_gdbus.h
@@ -25,9 +25,9 @@ extern "C"
 {
 #endif
 
-#define MDGD_DBUS_SERVICE "org.tizen.mdg" /**< For multi device group manager dbus */
+#define MDGD_DBUS_SERVICE "org.tizen.mdg" /**< For mdg dbus */
 #define MDGD_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group commands */
-#define  MDGD_DBUS_ENABLER_PATH "/org/tizen/mdg/enabler" /**< For d-bus activation */
+#define MDGD_DBUS_ENABLER_PATH "/org/tizen/mdg/enabler" /**< For d-bus activation */
 
 int mdgd_gdbus_init();
 

diff --git a/src/mdg-manager/include/mdgd_log.h b/src/mdg-manager/include/mdgd_log.h
index ec4bc9b..db0c3d7 100644 (file)
--- a/src/mdg-manager/include/mdgd_log.h
+++ b/src/mdg-manager/include/mdgd_log.h
@@ -39,7 +39,7 @@ extern "C"
 #define COLOR_LIGHTBLUE         "\033[0;37m"
 #define COLOR_END               "\033[0;m"
 
-#define LOG_TAG "MDGD_MANAGER"
+#define LOG_TAG "MDGD"
 
 #define LOG_DEBUG(fmt, ...) \
        do { \

diff --git a/src/mdg-manager/oic_svr_db_mdg_manager.dat b/src/mdg-manager/oic_svr_db_mdgd_manager.dat
similarity index 100%
rename from src/mdg-manager/oic_svr_db_mdg_manager.dat
rename to src/mdg-manager/oic_svr_db_mdgd_manager.dat

diff --git a/src/mdg-manager/oic_svr_db_mdg_manager.json b/src/mdg-manager/oic_svr_db_mdgd_manager.json
similarity index 100%
rename from src/mdg-manager/oic_svr_db_mdg_manager.json
rename to src/mdg-manager/oic_svr_db_mdgd_manager.json

diff --git a/src/mdg-manager/src/mdgd_context.c b/src/mdg-manager/src/mdgd_context.c
index 0ed7778..412df5e 100644 (file)
--- a/src/mdg-manager/src/mdgd_context.c
+++ b/src/mdg-manager/src/mdgd_context.c
@@ -24,7 +24,7 @@ int mdgd_context_create()
 {
        mdgd_ctx = g_new0(mdgd_context_t, 1);
        if (!mdgd_ctx) {
-               LOG_DEBUG("create comp_context is failed");
+               LOG_DEBUG("create mdgd_context is failed");
                return MDGD_ERROR_OUT_OF_MEMORY;
        }
        mdgd_ctx->mot_me = FALSE;

diff --git a/src/mdg-manager/src/mdgd_db.c b/src/mdg-manager/src/mdgd_db.c
index a8d1140..a2fc584 100644 (file)
--- a/src/mdg-manager/src/mdgd_db.c
+++ b/src/mdg-manager/src/mdgd_db.c
@@ -125,7 +125,7 @@ static int __check_integrity()
                if (ret == SQLITE_ROW) {
                        const char *ret_val = (const char *)sqlite3_column_text(stmt, 0);
                        LOG_ERR("ret_val: %s", ret_val);
-                       if (ret_val && strncmp(ret_val, "ok", strlen("ok")) == 0) {
+                       if (ret_val && strcmp(ret_val, "ok") == 0) {
                                result = 0;
                        } else {
                                LOG_ERR("failed to check integrity");

diff --git a/src/mdg-manager/src/mdgd_gdbus.c b/src/mdg-manager/src/mdgd_gdbus.c
index bf687ee..b7f3c42 100644 (file)
--- a/src/mdg-manager/src/mdgd_gdbus.c
+++ b/src/mdg-manager/src/mdgd_gdbus.c
@@ -165,7 +165,7 @@ static bool __group_init(GDBusConnection *connection)
        // Set connection to 'manager'
        g_dbus_object_manager_server_set_connection(group, connection);
 
-       // Export 'group' interface on cmdgd DBUS
+       // Export 'group' interface on mdg-manager DBUS
        ret = g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(group_skeleton),
                                connection, MDGD_DBUS_GROUP_PATH, &error);
 

diff --git a/src/mdg-manager/src/mdgd_group.c b/src/mdg-manager/src/mdgd_group.c
index fed7a5e..1f1d663 100644 (file)
--- a/src/mdg-manager/src/mdgd_group.c
+++ b/src/mdg-manager/src/mdgd_group.c
@@ -89,7 +89,7 @@ int mdgd_group_create(const char* name)
        for (l = list; l != NULL; l = l->next) {
                mdgd_grp_t *grp = (mdgd_grp_t *)l->data;
 
-               if (strncmp(grp->name, name, strlen(name)) == 0) {
+               if (strcmp(grp->name, name) == 0) {
                        LOG_ERR("already exists name in structure");
                        return MDGD_ERROR_UNKNOWN;
                }
@@ -626,7 +626,7 @@ int _is_pairwise_uuid(char *uuid)
        while (iter != NULL) {
                char *pairwise_uuid = (char *)iter->data;
 
-               if (strncmp(pairwise_uuid, uuid, strlen(uuid)) == 0)
+               if (strcmp(pairwise_uuid, uuid) == 0)
                        return 0;
 
                iter = g_list_next(iter);
@@ -646,11 +646,11 @@ int mdgd_group_add_device_in_group(const char *group_name, const char *uuid)
        while (iter != NULL) {
                mdgd_grp_t *group = (mdgd_grp_t *)iter->data;
 
-               if (strncmp(group_name, group->name, strlen(group_name)) == 0) {
+               if (strcmp(group_name, group->name) == 0) {
                        GList *device_iter = group->device_list;
                        while (device_iter != NULL) {
                                char *device_uuid = (char *)device_iter->data;
-                               if (strncmp(device_uuid, uuid, strlen(uuid)) == 0)
+                               if (strcmp(device_uuid, uuid) == 0)
                                        return -1;
 
                                device_iter = g_list_next(device_iter);
@@ -742,7 +742,7 @@ int mdgd_group_remove_device_in_group(char *group_name, char *uuid)
        iter = mdgd_ctx->grp_list;
        while (iter != NULL) {
                mdgd_grp_t *group = (mdgd_grp_t *)iter->data;
-               if (strncmp(group_name, group->name, strlen(group_name)) == 0) {
+               if (strcmp(group_name, group->name) == 0) {
                        GList *device_iter = group->device_list;
 
                        device_iter = g_list_remove_all(device_iter, uuid);

diff --git a/src/mdg-manager/src/mdgd_iot.cpp b/src/mdg-manager/src/mdgd_iot.cpp
index 2a2fdf2..3cbf4ce 100644 (file)
--- a/src/mdg-manager/src/mdgd_iot.cpp
+++ b/src/mdg-manager/src/mdgd_iot.cpp
@@ -819,7 +819,7 @@ static bool _found_resource(std::shared_ptr<OCResource> resource,
                                        return TRUE;
                                }
 
-                               if (strncmp(cmd->arg1, "disc_mot_enb_devs_done", strlen(cmd->arg1)) == 0)
+                               if (strcmp(cmd->arg1, "disc_mot_enb_devs_done") == 0)
                                        mowned = false;
                                else
                                        mowned = true;
@@ -900,7 +900,7 @@ static bool _found_resource(std::shared_ptr<OCResource> resource,
 
                                mdgd_check_null_ret_error("device", device, TRUE);
 
-                               if (strncmp(cmd->uuid, resource_device_id, strlen(resource_device_id)) != 0) {
+                               if (strcmp(cmd->uuid, resource_device_id) != 0) {
                                        LOG_DEBUG("Get peer description from another device");
                                        /* Get Peer Description using "Get" operation */
                                        device->type = MDGD_GROUP_DEVICE_REMOTE;
@@ -942,8 +942,7 @@ static bool _found_resource(std::shared_ptr<OCResource> resource,
                                LOG_DEBUG("Resource Type %s", resource_type);
                                LOG_DEBUG("Command Device ID: %s", cmd ? cmd->uuid : "NULL");
 
-                               if (cmd != NULL && strncmp(cmd->uuid, resource_device_id,
-                                       strlen(resource_device_id)) == 0) {
+                               if (cmd != NULL && strcmp(cmd->uuid, resource_device_id) == 0) {
                                        OCRepresentation rep;
 
                                        LOG_DEBUG("Request to Remote Device");
@@ -1025,7 +1024,7 @@ static gboolean _timeout_cb(gpointer data)
                if (cmd->command != MDGD_REQ_KEEP_ALIVE)
                        notify_send_data_finish("RESP_DATA", last_get_result);
        } else if (cmd->resource_type == MDGD_RESOURCE_TYPE_DEVICE) {
-               if (strncmp(cmd->arg1, "disc_mot_enb_devs_done", strlen(cmd->arg1)) == 0) {
+               if (strcmp(cmd->arg1, "disc_mot_enb_devs_done") == 0) {
                        LOG_DEBUG("Device Find Done. notified");
                        mdgd_group_notify_mot_enable_device_done();
 

diff --git a/src/mot-agent/CMakeLists.txt b/src/mot-agent/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 272903e..b475e20
--- a/src/mot-agent/CMakeLists.txt
+++ b/src/mot-agent/CMakeLists.txt
@@ -18,7 +18,7 @@ ADD_CUSTOM_COMMAND(
 MESSAGE(" - Check cmake packagesion")
 pkg_check_modules(ma_pkgs REQUIRED ${COMMON_DEPS} ${TIZEN_DEPS}
        capi-network-wifi-manager
-       #       sqlite3
+       sqlite3
        )
 
 ADD_CUSTOM_TARGET(GENERATED_MA_DBUS_CODE DEPENDS dbus1)