d2d-subowner: fix wrong signal senging problem

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

diff --git a/src/d2d-subowner/d2ds-subowner.c b/src/d2d-subowner/d2ds-subowner.c
index 3a8758a6fa273ff8397e816d01b5a2092e9857fb..a2bd80dcdf7ec2923979e3ffa28f564dff736d59 100644 (file)
--- a/src/d2d-subowner/d2ds-subowner.c
+++ b/src/d2d-subowner/d2ds-subowner.c
@@ -17,8 +17,6 @@
  * limitations under the License.
  *
  *****************************************************************/
-#include "iotivity_config.h"
-
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,19 +26,18 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "platform_features.h"
-#include "utlist.h"
-#include "logger.h"
-#include "oic_malloc.h"
-#include "oic_string.h"
-#include "ocprovisioningmanager.h"
-#include "oxmjustworks.h"
-#include "oxmrandompin.h"
-#include "srmutility.h"
-#include "securevirtualresourcetypes.h"
-#include "security/srmutility.h"
-#include "pmtypes.h"
-#include "pmutility.h"
+#include <iotivity_config.h>
+#include <platform_features.h>
+#include <utlist.h>
+#include <oic_malloc.h>
+#include <ocprovisioningmanager.h>
+#include <oxmjustworks.h>
+#include <oxmrandompin.h>
+#include <srmutility.h>
+#include <securevirtualresourcetypes.h>
+#include <security/srmutility.h>
+#include <pmtypes.h>
+#include <pmutility.h>
 
 #include <wifi-manager.h>
 #include <tzplatform_config.h>
@@ -735,9 +732,9 @@ static void __notify_found_devs(void  *data)
        devices = g_variant_builder_end(&builder);
 
        if (D2DS_DISC_MOT_ENB_DEVS == con->cid)
-               d2ds_notify_mowned_devs(devices);
-       else if (D2DS_DISC_MOWNED_DEVS == con->cid)
                d2ds_notify_mot_env_devs(devices);
+       else if (D2DS_DISC_MOWNED_DEVS == con->cid)
+               d2ds_notify_mowned_devs(devices);
 
        g_variant_builder_unref(&builder);
        g_variant_unref(devices);
@@ -1273,10 +1270,10 @@ static OicSecAcl_t* _create_target_acl(const OicUuid_t* target, const OicUuid_t*
        len = strlen(rsrc_uri)+1;  // '1' for null termination
        rsrc->href = (char*) OICCalloc(len, sizeof(char));
        if (!rsrc->href) {
-               D2DS_LOGE( "rsrc->href: OICStrdup failed =%d", errno);
+               D2DS_LOGE( "rsrc->href: OICCalloc failed =%d", errno);
                goto CREATE_ACL_ERROR;
        }
-       OICStrcpy(rsrc->href, len, rsrc_uri);
+       memcpy(rsrc->href, rsrc_uri, len);
 
        /* Fill the resource type (rt) */
        rsrc->typeLen = 1;
@@ -1285,9 +1282,9 @@ static OicSecAcl_t* _create_target_acl(const OicUuid_t* target, const OicUuid_t*
                D2DS_LOGE( "rsrc->types: OICCalloc failed =%d", errno);
                goto CREATE_ACL_ERROR;
        }
-       rsrc->types[0] = OICStrdup(rsrc_type);
+       rsrc->types[0] = g_strdup(rsrc_type);
        if (!rsrc->types[0]) {
-               D2DS_LOGE( "rsrc->types[0]: OICStrdup failed =%d", errno);
+               D2DS_LOGE( "rsrc->types[0]: g_strdup failed =%d", errno);
                goto CREATE_ACL_ERROR;
        }
 
@@ -1298,9 +1295,9 @@ static OicSecAcl_t* _create_target_acl(const OicUuid_t* target, const OicUuid_t*
                D2DS_LOGE( "rsrc->interfaces: OICCalloc failed =%d", errno);
                goto CREATE_ACL_ERROR;
        }
-       rsrc->interfaces[0] = OICStrdup(rsrc_interface);
+       rsrc->interfaces[0] = g_strdup(rsrc_interface);
        if (!rsrc->interfaces[0]) {
-               D2DS_LOGE( "rsrc->interfaces[0] : OICStrdup failed =%d", errno);
+               D2DS_LOGE( "rsrc->interfaces[0] : g_strdup failed =%d", errno);
                goto CREATE_ACL_ERROR;
        }
 
@@ -1677,15 +1674,15 @@ static int _provisioning_pairwise_link(d2ds_service *service, gchar *target_1, g
 
        con->target_1 = g_strdup(target_1);
        con->subject_1 = g_strdup(subject_1);
-       con->rsrc_uri_1 = OICStrdup(rsrc_uri_1);
-       con->rsrc_type_1 = OICStrdup(rsrc_type_1);
-       con->rsrc_interface_1 = OICStrdup(rsrc_interface_1);
+       con->rsrc_uri_1 = g_strdup(rsrc_uri_1);
+       con->rsrc_type_1 = g_strdup(rsrc_type_1);
+       con->rsrc_interface_1 = g_strdup(rsrc_interface_1);
 
        con->target_2 = g_strdup(target_2);
        con->subject_2 = g_strdup(subject_2);
-       con->rsrc_uri_2 = OICStrdup(rsrc_uri_2);
-       con->rsrc_type_2 = OICStrdup(rsrc_type_2);
-       con->rsrc_interface_2 = OICStrdup(rsrc_interface_2);
+       con->rsrc_uri_2 = g_strdup(rsrc_uri_2);
+       con->rsrc_type_2 = g_strdup(rsrc_type_2);
+       con->rsrc_interface_2 = g_strdup(rsrc_interface_2);
 
        con->thread = g_thread_try_new("prov_pairwise", _provisioning_pairwise_func,
                                                                   con, NULL);