From 7a9c4622e4ecfbbf0162188022fed4c9cdee48c7 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Mon, 25 Nov 2013 15:08:40 +0200 Subject: [PATCH] android/socket: Send connect signal to Android framework Android framework expects connect signal to be sent when remote device is connected. --- android/socket.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/android/socket.c b/android/socket.c index 4722cf861..f9a658791 100644 --- a/android/socket.c +++ b/android/socket.c @@ -424,6 +424,33 @@ static int handle_listen(void *buf) return hal_fd; } +static bool sock_send_connect(struct rfcomm_sock *rfsock, bdaddr_t *bdaddr) +{ + struct hal_sock_connect_signal cmd; + int len; + + DBG(""); + + memset(&cmd, 0, sizeof(cmd)); + cmd.size = sizeof(cmd); + bdaddr2android(bdaddr, cmd.bdaddr); + cmd.channel = rfsock->channel; + cmd.status = 0; + + len = write(rfsock->fd, &cmd, sizeof(cmd)); + if (len < 0) { + error("%s", strerror(errno)); + return false; + } + + if (len != sizeof(cmd)) { + error("Error sending connect signal"); + return false; + } + + return true; +} + static void connect_cb(GIOChannel *io, GError *err, gpointer user_data) { struct rfcomm_sock *rfsock = user_data; @@ -445,6 +472,9 @@ static void connect_cb(GIOChannel *io, GError *err, gpointer user_data) rfsock->fd, rfsock->real_sock, rfsock->channel, g_io_channel_unix_get_fd(io)); + if (!sock_send_connect(rfsock, dst)) + goto fail; + /* Handle events from Android */ cond = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL; io_stack = g_io_channel_unix_new(rfsock->fd); -- 2.47.3