Sync code with Tizen 3.0 branch

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

diff --git a/src/oem/oem_emul.c b/src/oem/oem_emul.c
old mode 100644 (file)
new mode 100755 (executable)
index 69bd0e9..e7a223e
--- a/src/oem/oem_emul.c
+++ b/src/oem/oem_emul.c
@@ -216,7 +216,7 @@ static net_nfc_target_handle_s * current_working_handle = NULL;
 static bool                    g_stack_init_successful = 0;
 static bool                    g_tag_attached = 0;
 static bool                    g_p2p_attached = 0;
-
+static int                     current_connection_id = 1;
 /* for llcp functionality */
 
 socket_info_s socket_info_array[LLCP_NB_SOCKET_MAX] = {{0,}};
@@ -1349,6 +1349,8 @@ static void _net_nfc_target_discovered_cb(emulMsg_s *emul_msg)
                return;
        }
 
+       target_detected->handle->connection_id = current_connection_id++;
+
        if(target_detected->devType == NET_NFC_NFCIP1_TARGET ){
                DEBUG_MSG("set llcp connection  type. remote device is target");
                handle->connection_type = NET_NFC_P2P_CONNECTION_TARGET;