Does not use g_strdup function when get sender id 13/126413/1 accepted/tizen/unified/20170426.061733 submit/tizen/20170425.110158 tizen_4.0.m1_release
authorjh8801.jung <jh8801.jung@samsung.com>
Fri, 21 Apr 2017 08:40:39 +0000 (17:40 +0900)
committerjh8801.jung <jh8801.jung@samsung.com>
Fri, 21 Apr 2017 08:42:42 +0000 (17:42 +0900)
Signed-off-by: jh8801.jung <jh8801.jung@samsung.com>
Change-Id: Id5df8037b161796929b68a0a44b632f384e06b30

packaging/nfc-manager.spec
src/manager/net_nfc_server_llcp.c

index 82aff7002bf6e3f4419f425ad6152b85661abed2..f8c8ee7182bbf02763f7a038c18f16d98197c040 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:    0.1.161
+Version:    0.1.162
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Flora-1.1
index 29ea68298650e131a43a95482c58170a2843366e..8b1ce5a364ed71d9ca362401d1046e5aaed60fd4 100755 (executable)
@@ -52,7 +52,7 @@ static net_nfc_llcp_config_info_s llcp_config =
 typedef struct _llcp_client_data
 {
        GDBusConnection *connection;
-       char *id;
+       GDBusMethodInvocation *invocation;
        net_nfc_target_handle_h handle;
        net_nfc_llcp_socket_t socket;
        void *user_data;
@@ -422,7 +422,7 @@ static void llcp_socket_error_cb(net_nfc_llcp_socket_t socket,
 
        if (g_dbus_connection_emit_signal(
                client_data->connection,
-               client_data->id,
+               g_dbus_method_invocation_get_sender(client_data->invocation),
                "/org/tizen/NetNfcService/Llcp",
                "org.tizen.NetNfcService.Llcp",
                "Error",
@@ -450,7 +450,7 @@ static void llcp_incoming_cb(net_nfc_llcp_socket_t socket,
 
        if (g_dbus_connection_emit_signal(
                client_data->connection,
-               client_data->id,
+               g_dbus_method_invocation_get_sender(client_data->invocation),
                "/org/tizen/NetNfcService/Llcp",
                "org.tizen.NetNfcService.Llcp",
                "Incoming",
@@ -695,8 +695,7 @@ static void llcp_handle_listen_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(
                data->invocation);
-       client_data->id = g_strdup(
-               g_dbus_method_invocation_get_sender(data->invocation));
+       client_data->invocation = data->invocation;
        client_data->handle = (net_nfc_target_handle_h)data->handle;
 
        if (net_nfc_controller_llcp_create_socket(&socket,
@@ -783,8 +782,7 @@ static void llcp_handle_accept_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(
                data->invocation);
-       client_data->id = g_strdup(
-               g_dbus_method_invocation_get_sender(data->invocation));
+       client_data->invocation = data->invocation;
        client_data->handle = (net_nfc_target_handle_h)data->handle;
        client_data->socket = data->client_socket;
 
@@ -863,8 +861,7 @@ static void llcp_handle_connect_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(
                data->invocation);
-       client_data->id = g_strdup(
-               g_dbus_method_invocation_get_sender(data->invocation));
+       client_data->invocation = data->invocation;
        client_data->handle = (net_nfc_target_handle_h)data->handle;
 
        if (net_nfc_controller_llcp_create_socket(&socket,
@@ -941,8 +938,7 @@ static void llcp_handle_connect_sap_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(
                data->invocation);
-       client_data->id = g_strdup(
-               g_dbus_method_invocation_get_sender(data->invocation));
+       client_data->invocation = data->invocation;
        client_data->handle = (net_nfc_target_handle_h)data->handle;
 
        if (net_nfc_controller_llcp_create_socket(&socket,