Return-Path: From: Andrei Emeltchenko To: linux-bluetooth@vger.kernel.org Subject: [PATCHv4 12/17] android/socket: Implement HAL connect call Date: Mon, 18 Nov 2013 15:20:49 +0200 Message-Id: <1384780854-20970-13-git-send-email-Andrei.Emeltchenko.news@gmail.com> In-Reply-To: <1384780854-20970-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> References: <1384780854-20970-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Andrei Emeltchenko HAL connect uses similar event handlers like listen call. --- android/socket.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/android/socket.c b/android/socket.c index 63c553a..5bedb60 100644 --- a/android/socket.c +++ b/android/socket.c @@ -380,8 +380,49 @@ static int handle_listen(void *buf) return hal_fd; } -static void connect_cb(GIOChannel *io, GError *err, gpointer user_data) +static void connect_cb(GIOChannel *io, GError *conn_err, gpointer user_data) { + struct rfcomm_sock *rfsock = user_data; + GIOChannel *io_stack; + GError *io_err = NULL; + bdaddr_t dst; + char address[18]; + int chan = -1; + + bt_io_get(io, &io_err, + BT_IO_OPT_DEST_BDADDR, &dst, + BT_IO_OPT_INVALID); + if (io_err) { + error("%s", io_err->message); + g_error_free(io_err); + goto fail; + } + + if (conn_err) { + error("%s", conn_err->message); + goto fail; + } + + ba2str(&dst, address); + DBG("Connected to %s rfsock %p chan %d", address, rfsock, chan); + + DBG("rfsock: fd %d real_sock %d chan %u sock %d", + rfsock->fd, rfsock->real_sock, rfsock->channel, + g_io_channel_unix_get_fd(io)); + + /* Handle events from Android */ + io_stack = g_io_channel_unix_new(rfsock->fd); + g_io_add_watch(io_stack, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL, + sock_stack_event_cb, rfsock); + g_io_channel_unref(io_stack); + + /* Handle rfcomm events */ + g_io_add_watch(io, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, + sock_rfcomm_event_cb, rfsock); + + return; +fail: + cleanup_rfsock(rfsock); } static void sdp_search_cb(sdp_list_t *recs, int err, gpointer data) -- 1.7.10.4