From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv4 08/17] android/socket: Implement accept signal over Android fd
Date: Mon, 18 Nov 2013 15:20:45 +0200 [thread overview]
Message-ID: <1384780854-20970-9-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1384780854-20970-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
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
next prev parent reply other threads:[~2013-11-18 13:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-18 13:20 [PATCHv4 00/17] Socket HAL Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 01/17] android/socket: Add connect signal to socket Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 02/17] android: trivial: Add comment making code consistent Andrei Emeltchenko
2013-11-19 9:22 ` Johan Hedberg
2013-11-18 13:20 ` [PATCHv4 03/17] android/socket: Add get RFCOMM default channel Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 04/17] android/socket: Define structs and implement listen Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 05/17] android/socket: Implement socket accepted event Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 06/17] android/socket: Implement Android RFCOMM stack events Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 07/17] android/socket: Implement RFCOMM events Andrei Emeltchenko
2013-11-18 13:20 ` Andrei Emeltchenko [this message]
2013-11-18 13:20 ` [PATCHv4 09/17] android/socket: Write channel to Android fd Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 10/17] android/socket: Implement socket connect HAL method Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 11/17] android/socket: Parse SDP response and connect Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 12/17] android/socket: Implement HAL connect call Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 13/17] android/socket: Send RFCOMM channel to framework Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 14/17] android/socket: Send connect signal on connect Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 15/17] android/socket: Close file descriptor after sending Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 16/17] android/socket: Add SDP record for OPP profile Andrei Emeltchenko
2013-11-18 13:20 ` [PATCHv4 17/17] android/socket: Add MAS uuid to channel mapping Andrei Emeltchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384780854-20970-9-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).