Sync code with Tizen 3.0 branch

Change-Id: I41caa6a885ec46f07cdae3773eb4c20bf9600432
Signed-off-by: HyiHong Chae <hh.chae@samsung.com>

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 806517a59ee7c74698e8f2e7957fcfe53c7c39a7..523a9a274bfde4685ab549b0c1810e570c7ccbf7 100755 (executable)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -1,6 +1,6 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:    0.1.152
+Version:    0.1.155
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Flora-1.1

diff --git a/src/commonlib/CMakeLists.txt b/src/commonlib/CMakeLists.txt
index 02dd7c96a35ff6a3ff8f15d999effd161abdded0..2da0e52a98d0998634107baae5aca6e2279a9f98 100755 (executable)
--- a/src/commonlib/CMakeLists.txt
+++ b/src/commonlib/CMakeLists.txt
@@ -34,7 +34,7 @@ MESSAGE("CHECK MODULE in COMMON_LIB ${commonlib_pkges_LDFLAGS}")
 
 # this for NFC flag
 
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration  -fno-strict-aliasing -Wl,-zdefs")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -Wl,-zdefs")
 
 SET(ARM_CFLAGS "${ARM_CLAGS} -mapcs -mno-sched-prolog -mabi=aapcs-linux -Uarm -fno-common -fpic")
 

diff --git a/src/commonlib/include/net_nfc_typedef_internal.h b/src/commonlib/include/net_nfc_typedef_internal.h
index af6b322ccfad700a5e9ccf86c4f6b1ee38c68922..ff5504ea841b92de3dce84b25e62000a1a918641 100755 (executable)
--- a/src/commonlib/include/net_nfc_typedef_internal.h
+++ b/src/commonlib/include/net_nfc_typedef_internal.h
@@ -225,7 +225,7 @@ typedef enum _net_nfc_privilege_e
        uint32_t request_type; \
        uint32_t client_fd; \
        uint32_t flags; \
-       uint32_t user_param; \
+       void *user_param; \
        /* DON'T MODIFY THIS CODE - END */
 
 typedef struct _net_nfc_request_msg_t

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index 24a1761105df177fc984fc111df21219a2fab59c..0ace6ee8355ac67036913b098b41338656f0f1ff 100755 (executable)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -40,7 +40,7 @@ MESSAGE("CHECK MODULE in MANAGER ${manager_pkges_LDFLAGS}")
 
 # this for NFC flag
 
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration  -fno-strict-aliasing -Wl,-zdefs -fvisibility=hidden")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -Wl,-zdefs -fvisibility=hidden")
 
 SET(ARM_CFLAGS "${ARM_CLAGS} -mapcs -mno-sched-prolog -mabi=aapcs-linux -Uarm -fno-common -fpic")
 

diff --git a/src/manager/include/net_nfc_server_tag.h b/src/manager/include/net_nfc_server_tag.h
old mode 100644 (file)
new mode 100755 (executable)
index 0c37a7a..a81d294
--- a/src/manager/include/net_nfc_server_tag.h
+++ b/src/manager/include/net_nfc_server_tag.h
@@ -28,7 +28,9 @@ void net_nfc_server_set_target_info(net_nfc_current_target_info_s *info);
 
 net_nfc_current_target_info_s *net_nfc_server_get_target_info(void);
 
-gboolean net_nfc_server_target_connected(net_nfc_target_handle_s *handle);
+net_nfc_target_handle_s *net_nfc_server_get_target_handle(void);
+
+gboolean net_nfc_server_target_connected(uint32_t handle);
 
 void net_nfc_server_free_target_info(void);
 

diff --git a/src/manager/include/net_nfc_server_vconf.h b/src/manager/include/net_nfc_server_vconf.h
index c6b07e472ba213d1f205977ed955c6796eac6eed..a9a96d00d73de35c69b60ebb38693f747cd60ef0 100755 (executable)
--- a/src/manager/include/net_nfc_server_vconf.h
+++ b/src/manager/include/net_nfc_server_vconf.h
@@ -20,8 +20,6 @@ void net_nfc_server_vconf_init(void);
 
 void net_nfc_server_vconf_deinit(void);
 
-bool net_nfc_check_csc_vconf(void);
-
 bool net_nfc_check_start_polling_vconf(void);
 
 void net_nfc_server_vconf_set_screen_on_flag(bool flag);

diff --git a/src/manager/net_nfc_manager.c b/src/manager/net_nfc_manager.c
index 22181cea24d7003b3c9ca746dd2526f5c6c0f5ca..605af04361e39b14ef32af25b9733496e831c8bc 100755 (executable)
--- a/src/manager/net_nfc_manager.c
+++ b/src/manager/net_nfc_manager.c
@@ -140,13 +140,11 @@ static void on_name_lost(GDBusConnection *connnection,
 
 int main(int argc, char *argv[])
 {
-
        void *handle = NULL;
        guint id = 0;
        gboolean use_daemon = FALSE;
        GOptionContext *option_context;
        GError *error = NULL;
-       bool check_csc = 0;
 
        option_context = g_option_context_new("Nfc manager");
        g_option_context_add_main_entries(option_context,
@@ -169,10 +167,6 @@ int main(int argc, char *argv[])
        DEBUG_SERVER_MSG("start nfc manager");
        DEBUG_SERVER_MSG("use_daemon : %d", use_daemon);
 
-       check_csc = net_nfc_check_csc_vconf();
-       if (check_csc)
-               return 0;
-
        net_nfc_manager_init_log();
 
        net_nfc_app_util_clean_storage(MESSAGE_STORAGE);

diff --git a/src/manager/net_nfc_manager_util.c b/src/manager/net_nfc_manager_util.c
index 04306b42d91cc39b6a72e8a3427cb7ea6d5fccb0..4fc3a404d4305793f43f9bcc2c98817d2304ee4c 100755 (executable)
--- a/src/manager/net_nfc_manager_util.c
+++ b/src/manager/net_nfc_manager_util.c
@@ -109,7 +109,7 @@ void net_nfc_manager_util_play_sound(net_nfc_sound_type_e sound_type)
                        if (ret == SOUND_MANAGER_ERROR_NONE) {
                                ret = sound_manager_acquire_focus(stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, NULL);
                                if (ret == SOUND_MANAGER_ERROR_NONE) {
-                                       ret = wav_player_start_with_stream_info(sound_path,
+                                       ret = wav_player_start_new(sound_path,
                                                stream_info, __wav_start_completed_cb, stream_info, &id);
                                        if (ret == WAV_PLAYER_ERROR_NONE) {
                                                DEBUG_SERVER_MSG("wav_player_start_with_stream_info success");

diff --git a/src/manager/net_nfc_server_common.c b/src/manager/net_nfc_server_common.c
index b1376ae5729ed74cd57105e88e59d89c4caf863f..b56135909ffaa7f067d4564cc5254618bf4bddef 100755 (executable)
--- a/src/manager/net_nfc_server_common.c
+++ b/src/manager/net_nfc_server_common.c
@@ -209,7 +209,7 @@ static void controller_se_transaction_cb(void *info,
 
        g_assert(info != NULL);
 
-       req->user_param = (uint32_t)user_context;
+       req->user_param = user_context;
 
 
        DEBUG_SERVER_MSG("SE Transaction = [%d]", req->request_type );
@@ -348,7 +348,7 @@ static void controller_llcp_event_cb(void *info, void *user_context)
        net_nfc_request_llcp_msg_t *req_msg = info;
 
        if(user_context != NULL)
-               req_msg->user_param = (uint32_t)user_context;
+               req_msg->user_param = user_context;
 
        if (net_nfc_server_controller_async_queue_push_force(
                _controller_llcp_event_cb, req_msg) == FALSE)
@@ -554,9 +554,11 @@ gboolean net_nfc_server_controller_thread_init(void)
 
        if (controller_thread == NULL)
        {
-               DEBUG_ERR_MSG("can not create controller thread: %s",
-                               error->message);
-               g_error_free(error);
+               DEBUG_ERR_MSG("can not create controller thread");
+               if (error != NULL) {
+                       DEBUG_ERR_MSG("error msg : %s", error->message);
+                       g_error_free(error);
+               }
                return FALSE;
        }
 

diff --git a/src/manager/net_nfc_server_handover_wps.c b/src/manager/net_nfc_server_handover_wps.c
index 9fe259624c432d16a16a474e3c50f35978b8f3dd..e0e152ecc4038a2e5103d06e9a195528aa381fbc 100755 (executable)
--- a/src/manager/net_nfc_server_handover_wps.c
+++ b/src/manager/net_nfc_server_handover_wps.c
@@ -229,7 +229,12 @@ static bool _wifi_found_ap_cb(wifi_ap_h ap, void *user_data)
        int ret;
 
        ret = wifi_ap_get_essid(ap, &ssid);
-       if (ret == WIFI_ERROR_NONE && ssid != NULL) {
+       if (ssid == NULL) {
+               DEBUG_ERR_MSG("ssid is NULL");
+               return true;
+       }
+
+       if (ret == WIFI_ERROR_NONE) {
                SECURE_MSG("ssid [%s]", ssid);
 
                if (g_strcmp0(ssid, (char *)context[0]) == 0) {
@@ -241,14 +246,14 @@ static bool _wifi_found_ap_cb(wifi_ap_h ap, void *user_data)
                } else {
                        result = true;
                }
-
-               g_free(ssid);
        } else {
                DEBUG_ERR_MSG("wifi_ap_get_bssid failed, [%d]", ret);
 
                result = true;
        }
 
+       g_free(ssid);
+
        return result;
 }
 

diff --git a/src/manager/net_nfc_server_ndef.c b/src/manager/net_nfc_server_ndef.c
index 586565e53b7dfac9d6cc974d70a79cb4a6eb5a2f..97f20d0c010b17738e4995f08db49c608a2a2c6e 100755 (executable)
--- a/src/manager/net_nfc_server_ndef.c
+++ b/src/manager/net_nfc_server_ndef.c
@@ -116,9 +116,8 @@ static void ndef_read_thread_func(gpointer user_data)
        g_assert(data->ndef != NULL);
        g_assert(data->invocation != NULL);
 
-       handle = GUINT_TO_POINTER(data->handle);
-
-       if (net_nfc_server_target_connected(handle) == true) {
+       if (net_nfc_server_target_connected(data->handle) == true) {
+               handle = net_nfc_server_get_target_handle();
                net_nfc_controller_read_ndef(handle, &read_data, &result);
        } else {
                result = NET_NFC_TARGET_IS_MOVED_AWAY;
@@ -152,9 +151,8 @@ static void ndef_write_thread_func(gpointer user_data)
        g_assert(data->ndef != NULL);
        g_assert(data->invocation != NULL);
 
-       handle = GUINT_TO_POINTER(data->handle);
-
-       if (net_nfc_server_target_connected(handle) == true) {
+       if (net_nfc_server_target_connected(data->handle) == true) {
+               handle = net_nfc_server_get_target_handle();
                net_nfc_controller_write_ndef(handle, &data->data, &result);
        } else {
                result = NET_NFC_TARGET_IS_MOVED_AWAY;
@@ -183,9 +181,8 @@ static void ndef_make_read_only_thread_func(gpointer user_data)
        g_assert(data->ndef != NULL);
        g_assert(data->invocation != NULL);
 
-       handle = GUINT_TO_POINTER(data->handle);
-
-       if (net_nfc_server_target_connected(handle) == true) {
+       if (net_nfc_server_target_connected(data->handle) == true) {
+               handle = net_nfc_server_get_target_handle();
                net_nfc_controller_make_read_only_ndef(handle, &result);
        } else {
                result = NET_NFC_TARGET_IS_MOVED_AWAY;
@@ -212,9 +209,8 @@ static void ndef_format_thread_func(gpointer user_data)
        g_assert(data->ndef != NULL);
        g_assert(data->invocation != NULL);
 
-       handle = GUINT_TO_POINTER(data->handle);
-
-       if (net_nfc_server_target_connected(handle) == true) {
+       if (net_nfc_server_target_connected(data->handle) == true) {
+               handle = net_nfc_server_get_target_handle();
                net_nfc_controller_format_ndef(handle, &data->key, &result);
        } else {
                result = NET_NFC_TARGET_IS_MOVED_AWAY;

diff --git a/src/manager/net_nfc_server_p2p.c b/src/manager/net_nfc_server_p2p.c
index cf8a1f1de3cb8c8ac1939d71e576d4c5c035c22a..eb7ce8548806a95ee931b119522698362a3278e1 100755 (executable)
--- a/src/manager/net_nfc_server_p2p.c
+++ b/src/manager/net_nfc_server_p2p.c
@@ -223,8 +223,7 @@ void net_nfc_server_p2p_discovered(net_nfc_target_handle_h handle)
                return;
        }
 
-       net_nfc_gdbus_p2p_emit_discovered(p2p_skeleton,
-                                       GPOINTER_TO_UINT(handle));
+       net_nfc_gdbus_p2p_emit_discovered(p2p_skeleton, handle->connection_id);
 
        net_nfc_manager_util_play_sound(NET_NFC_TASK_START);
 }

diff --git a/src/manager/net_nfc_server_process_snep.c b/src/manager/net_nfc_server_process_snep.c
index 795a9586ef17029731ae9f0177c26a370da34be8..3adc3a0075254d1de5799cfe63cb3373dd7046eb 100755 (executable)
--- a/src/manager/net_nfc_server_process_snep.c
+++ b/src/manager/net_nfc_server_process_snep.c
@@ -1377,7 +1377,7 @@ net_nfc_error_e net_nfc_server_snep_server(
                return NET_NFC_NULL_PARAMETER;
        }
 
-       if (net_nfc_server_target_connected(handle) == false) {
+       if (net_nfc_server_target_connected(handle->connection_id) == false) {
                return NET_NFC_NOT_CONNECTED;
        }
 
@@ -1433,7 +1433,7 @@ net_nfc_error_e net_nfc_server_snep_server_send_get_response(
                return NET_NFC_INVALID_PARAM;
        }
 
-       if (net_nfc_server_target_connected(context->handle) == false) {
+       if (net_nfc_server_target_connected(context->handle->connection_id) == false) {
                return NET_NFC_NOT_CONNECTED;
        }
 
@@ -1725,7 +1725,7 @@ net_nfc_error_e net_nfc_server_snep_client(
                return NET_NFC_NULL_PARAMETER;
        }
 
-       if (net_nfc_server_target_connected(handle) == false) {
+       if (net_nfc_server_target_connected(handle->connection_id) == false) {
                return NET_NFC_NOT_CONNECTED;
        }
 
@@ -1793,7 +1793,7 @@ net_nfc_error_e net_nfc_server_snep_client_request(
                return NET_NFC_NULL_PARAMETER;
        }
 
-       if (net_nfc_server_target_connected(context->handle) == false) {
+       if (net_nfc_server_target_connected(context->handle->connection_id) == false) {
                return NET_NFC_NOT_CONNECTED;
        }
 

diff --git a/src/manager/net_nfc_server_se.c b/src/manager/net_nfc_server_se.c
index 1c0d371083bb3c0233bd147377fe505ec9b9d145..f1bd8f7a91b2818c459388b208771f5a826fdd9f 100755 (executable)
--- a/src/manager/net_nfc_server_se.c
+++ b/src/manager/net_nfc_server_se.c
@@ -4428,6 +4428,9 @@ static void net_nfc_server_se_deactivated_card_thread_func(gpointer user_data)
        else {
                DEBUG_ERR_MSG("failed to net_nfc_server_se_open_ese()");
        }
+
+       if (cmd != NULL)
+               g_free(cmd);
 }
 
 void net_nfc_server_se_deactivate_card(void)

diff --git a/src/manager/net_nfc_server_tag.c b/src/manager/net_nfc_server_tag.c
index 89734be204338e01640b892d4d5c805e69cf831a..62c478159faa0b444be2ab5613e216c226297a28 100755 (executable)
--- a/src/manager/net_nfc_server_tag.c
+++ b/src/manager/net_nfc_server_tag.c
@@ -268,7 +268,7 @@ END :
        net_nfc_server_set_state(NET_NFC_SERVER_IDLE);
 
        net_nfc_gdbus_tag_emit_tag_detached(tag_skeleton,
-               GPOINTER_TO_UINT(handle),
+               handle->connection_id,
                data->dev_type);
 
        g_free(data);
@@ -596,7 +596,7 @@ static bool _process_attached_tags(net_nfc_current_target_info_s *target)
        if (tag_skeleton != NULL) {
                /* send TagDiscoverd signal */
                net_nfc_gdbus_tag_emit_tag_discovered(tag_skeleton,
-                       GPOINTER_TO_UINT(target->handle),
+                       target->handle->connection_id,
                        target->devType,
                        is_ndef_supported,
                        ndef_card_state,
@@ -935,12 +935,25 @@ net_nfc_current_target_info_s *net_nfc_server_get_target_info(void)
        return current_target_info;
 }
 
-gboolean net_nfc_server_target_connected(net_nfc_target_handle_s *handle)
+net_nfc_target_handle_s *net_nfc_server_get_target_handle(void)
+{
+       net_nfc_target_handle_s *handle = NULL;
+
+       if (current_target_info != NULL)
+               handle = current_target_info->handle;
+
+       return handle;
+}
+
+gboolean net_nfc_server_target_connected(uint32_t handle)
 {
        if (current_target_info == NULL)
                return FALSE;
 
-       if (current_target_info->handle != handle)
+       if (current_target_info->handle == NULL)
+               return FALSE;
+
+       if (current_target_info->handle->connection_id != handle)
                return FALSE;
 
        return TRUE;

diff --git a/src/manager/net_nfc_server_transceive.c b/src/manager/net_nfc_server_transceive.c
index bb42f05fae6b1fdd881a0cf0f27cb91bf9e6a46e..e6d3d496b80bc3156483cb7ffec2a448d41d0d5e 100755 (executable)
--- a/src/manager/net_nfc_server_transceive.c
+++ b/src/manager/net_nfc_server_transceive.c
@@ -62,8 +62,7 @@ struct _TransceiveSendData
 static void transceive_data_thread_func(gpointer user_data)
 {
        TransceiveSendData *transceive_data = (TransceiveSendData*)user_data;
-       net_nfc_target_handle_s *handle =
-               (net_nfc_target_handle_s *)transceive_data->transceive_handle;
+       net_nfc_target_handle_s *handle;
        net_nfc_error_e result = NET_NFC_OK;
        data_s *data = NULL;
        GVariant *resp_data = NULL;
@@ -73,9 +72,10 @@ static void transceive_data_thread_func(gpointer user_data)
        g_assert(transceive_data->transceive != NULL);
        g_assert(transceive_data->invocation != NULL);
 
-       if (net_nfc_server_target_connected(handle) == true)
+       if (net_nfc_server_target_connected(transceive_data->transceive_handle) == true)
        {
                DEBUG_SERVER_MSG("call transceive");
+               handle = net_nfc_server_get_target_handle();
 
                if (net_nfc_controller_transceive(handle,
                        &transceive_data->transceive_info,
@@ -189,8 +189,7 @@ ERROR :
 static void transceive_thread_func(gpointer user_data)
 {
        TransceiveSendData *transceive_data = (TransceiveSendData *)user_data;
-       net_nfc_target_handle_s *handle =
-               (net_nfc_target_handle_s *)transceive_data->transceive_handle;
+       net_nfc_target_handle_s *handle;
        net_nfc_error_e result = NET_NFC_OK;
        data_s *data = NULL;
 
@@ -199,9 +198,10 @@ static void transceive_thread_func(gpointer user_data)
        g_assert(transceive_data->transceive != NULL);
        g_assert(transceive_data->invocation != NULL);
 
-       if (net_nfc_server_target_connected(handle) == true)
+       if (net_nfc_server_target_connected(transceive_data->transceive_handle) == true)
        {
                DEBUG_MSG("call transceive");
+               handle = net_nfc_server_get_target_handle();
 
                if (net_nfc_controller_transceive(handle,
                        &transceive_data->transceive_info,

diff --git a/src/manager/net_nfc_server_vconf.c b/src/manager/net_nfc_server_vconf.c
index 4dc86dc55b2042f2b803a8ce1d407c133c039d19..2cbaa1ffe64857b9d5d2126f5f87f2658bd9530b 100755 (executable)
--- a/src/manager/net_nfc_server_vconf.c
+++ b/src/manager/net_nfc_server_vconf.c
@@ -212,22 +212,6 @@ void net_nfc_server_vconf_deinit(void)
                        net_nfc_server_vconf_other_handlers_changed);
 }
 
-bool net_nfc_check_csc_vconf(void)
-{
-       int state = 0;;
-
-       if (state == true)
-       {
-               DEBUG_ERR_MSG("This is CSC Booting!!");
-               return true;
-       }
-       else
-       {
-               DEBUG_ERR_MSG("This is Normal Booting!!");
-               return false;
-       }
-}
-
 bool net_nfc_check_start_polling_vconf(void)
 {
        gint lock_state = 0;