From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> Android expects to get accept signal over file descriptor which was set during listen HAL call. --- android/socket.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/android/socket.c b/android/socket.c index 154c330..a02bb1e 100644 --- a/android/socket.c +++ b/android/socket.c @@ -37,6 +37,7 @@ #include "hal-msg.h" #include "hal-ipc.h" #include "ipc.h" +#include "utils.h" #include "socket.h" #define OPP_DEFAULT_CHANNEL 9 @@ -107,6 +108,45 @@ static struct { } }; +static int bt_sock_send_fd(int sock_fd, const void *buf, int len, int send_fd) +{ + ssize_t ret; + struct msghdr msg; + struct cmsghdr *cmsg; + struct iovec iv; + char msgbuf[CMSG_SPACE(1)]; + + DBG("len %d sock_fd %d send_fd %d", len, sock_fd, send_fd); + + if (sock_fd == -1 || send_fd == -1) + return -1; + + memset(&msg, 0, sizeof(msg)); + + msg.msg_control = msgbuf; + msg.msg_controllen = sizeof(msgbuf); + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = CMSG_LEN(sizeof(send_fd)); + memcpy(CMSG_DATA(cmsg), &send_fd, sizeof(send_fd)); + + iv.iov_base = (unsigned char *) buf; + iv.iov_len = len; + + msg.msg_iov = &iv; + msg.msg_iovlen = 1; + + ret = sendmsg(sock_fd, &msg, MSG_NOSIGNAL); + if (ret < 0) { + error("sendmsg(): sock_fd %d send_fd %d: %s", + sock_fd, send_fd, strerror(errno)); + return ret; + } + + return ret; +} + static int get_rfcomm_default_chan(const uint8_t *uuid) { unsigned int i; @@ -228,6 +268,21 @@ static gboolean sock_rfcomm_event_cb(GIOChannel *io, GIOCondition cond, return TRUE; } +static void sock_send_accept(struct rfcomm_sock *rfsock, bdaddr_t *bdaddr, + int fd_accepted) +{ + struct hal_sock_connect_signal cmd; + + DBG(""); + + cmd.size = sizeof(cmd); + bdaddr2android(bdaddr, cmd.bdaddr); + cmd.channel = rfsock->channel; + cmd.status = 0; + + bt_sock_send_fd(rfsock->fd, &cmd, sizeof(cmd), fd_accepted); +} + static void accept_cb(GIOChannel *io, GError *err, gpointer user_data) { struct rfcomm_sock *rfsock = user_data; @@ -258,6 +313,8 @@ static void accept_cb(GIOChannel *io, GError *err, gpointer user_data) rfsock_acc = create_rfsock(sock_acc, &hal_fd); connections = g_list_append(connections, rfsock_acc); + sock_send_accept(rfsock, &dst, hal_fd); + /* Handle events from Android */ io_stack = g_io_channel_unix_new(rfsock_acc->fd); g_io_add_watch(io_stack, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html