Modify bt_socket_accept to match Tizen2.3

Tizen2.3 have been used in Tizen.
Therefore, bt_socket_accept need to be modified to match it.

Change-Id: I4e46619905e953697d14eec4aaeb348d6ecabcef
Signed-off-by: Wu Zheng <wu.zheng@intel.com>

diff --git a/capi/bluetooth.c b/capi/bluetooth.c
index aecd87a0e6e72121ba13177ef3a189b6c3b520de..fc3777a43e7b81d3ebce364618f8a542f468c452 100644 (file)
--- a/capi/bluetooth.c
+++ b/capi/bluetooth.c
@@ -5172,29 +5172,16 @@ int bt_socket_listen_and_accept_rfcomm(int socket_fd,
        return BT_SUCCESS;
 }
 
-int bt_socket_accept(int requested_socket_fd, int *connected_socket_fd)
+int bt_socket_accept(int requested_socket_fd)
 {
        struct spp_context *spp_ctx;
 
-       if (connected_socket_fd == NULL)
-               return BT_ERROR_INVALID_PARAMETER;
-
        spp_ctx = find_spp_context_from_socketfd(requested_socket_fd);
        if (spp_ctx == NULL)
                return BT_ERROR_OPERATION_FAILED;
 
        bt_spp_accept(spp_ctx->requestion);
 
-       /* BlueZ 5.x GAP.
-        * Note: this connected_socket_fd maybe invalid, because
-        * connected_socket_fd should return by connection_state_changed,
-        */
-       if (spp_ctx->channel == NULL)
-               *connected_socket_fd = -1;
-       else
-               *connected_socket_fd =
-                               g_io_channel_unix_get_fd(spp_ctx->channel);
-
        return BT_SUCCESS;
 }
 

diff --git a/include/bluetooth.h b/include/bluetooth.h
index 5db572976226b0f1e90e155cec9384b711a30bbc..04aea0777e35e16d8e801fb5d2cf55894467b3fc 100644 (file)
--- a/include/bluetooth.h
+++ b/include/bluetooth.h
@@ -1883,7 +1883,7 @@ int bt_socket_listen(int socket_fd, int max_pending_connections);
  * @see bt_socket_listen()
  * @see bt_socket_reject()
 */
-int bt_socket_accept(int requested_socket_fd, int *connected_socket_fd);
+int bt_socket_accept(int requested_socket_fd);
 
 /**
  * @ingroup  CAPI_NETWORK_BLUETOOTH_SOCKET_MODULE