From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv6 02/19] android/socket: Handling rfcomm sockets
Date: Wed, 20 Nov 2013 12:24:20 +0200 [thread overview]
Message-ID: <1384943077-5366-3-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1384943077-5366-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Implement functions creating and destroying rfcomm_socket structures.
---
android/socket.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 63 insertions(+), 1 deletion(-)
diff --git a/android/socket.c b/android/socket.c
index d4c7674..e19b2aa 100644
--- a/android/socket.c
+++ b/android/socket.c
@@ -27,6 +27,7 @@
#include <glib.h>
#include <stdbool.h>
+#include <unistd.h>
#include <errno.h>
#include "lib/bluetooth.h"
@@ -43,6 +44,61 @@
static bdaddr_t adapter_addr;
+/* Simple list of RFCOMM server sockets */
+GList *servers = NULL;
+
+/* Simple list of RFCOMM connected sockets */
+GList *connections = NULL;
+
+struct rfcomm_sock {
+ int fd; /* descriptor for communication with Java framework */
+ int real_sock; /* real RFCOMM socket */
+ int channel; /* RFCOMM channel */
+
+ guint rfcomm_watch;
+ guint stack_watch;
+};
+
+static struct rfcomm_sock *create_rfsock(int sock, int *hal_fd)
+{
+ int fds[2] = {-1, -1};
+ struct rfcomm_sock *rfsock;
+
+ if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fds) < 0) {
+ error("socketpair(): %s", strerror(errno));
+ *hal_fd = -1;
+ return NULL;
+ }
+
+ rfsock = g_new0(struct rfcomm_sock, 1);
+ rfsock->fd = fds[0];
+ *hal_fd = fds[1];
+ rfsock->real_sock = sock;
+
+ return rfsock;
+}
+
+static void cleanup_rfsock(struct rfcomm_sock *rfsock)
+{
+ DBG("rfsock: %p fd %d real_sock %d chan %u",
+ rfsock, rfsock->fd, rfsock->real_sock, rfsock->channel);
+
+ if (rfsock->fd > 0)
+ close(rfsock->fd);
+ if (rfsock->real_sock > 0)
+ close(rfsock->real_sock);
+
+ if (rfsock->rfcomm_watch > 0)
+ if (!g_source_remove(rfsock->rfcomm_watch))
+ error("rfcomm_watch source was not found");
+
+ if (rfsock->stack_watch > 0)
+ if (!g_source_remove(rfsock->stack_watch))
+ error("stack_watch source was not found");
+
+ g_free(rfsock);
+}
+
static struct profile_info {
uint8_t uuid[16];
uint8_t channel;
@@ -81,6 +137,8 @@ static int handle_listen(void *buf)
{
struct hal_cmd_sock_listen *cmd = buf;
struct profile_info *profile;
+ struct rfcomm_sock *rfsock;
+ int hal_fd;
int chan;
DBG("");
@@ -93,7 +151,11 @@ static int handle_listen(void *buf)
DBG("rfcomm channel %d", chan);
- return -1;
+ rfsock = create_rfsock(-1, &hal_fd);
+ if (!rfsock)
+ return -1;
+
+ return hal_fd;
}
static int handle_connect(void *buf)
--
1.7.10.4
next prev parent reply other threads:[~2013-11-20 10:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 10:24 [PATCHv6 00/19] Socket HAL Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 01/19] android/socket: Add get RFCOMM default channel Andrei Emeltchenko
2013-11-20 10:24 ` Andrei Emeltchenko [this message]
2013-11-20 13:06 ` [PATCHv6 02/19] android/socket: Handling rfcomm sockets Johan Hedberg
2013-11-20 10:24 ` [PATCHv6 03/19] android/socket: Implement listen on RFCOMM socket Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 04/19] android/socket: Implement socket accepted event Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 05/19] android/socket: Implement Android RFCOMM stack events Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 06/19] android/socket: Implement RFCOMM events Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 07/19] android/socket: Send accept signal to Android framework Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 08/19] android/socket: Notify channel " Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 09/19] android/socket: Implement socket connect HAL method Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 10/19] android/socket: Parse SDP response and connect Andrei Emeltchenko
2013-11-20 13:21 ` Johan Hedberg
2013-11-20 10:24 ` [PATCHv6 11/19] android/socket: Implement HAL connect call Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 12/19] android/socket: Send RFCOMM channel to framework Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 13/19] android/socket: Send connect signal to Android framework Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 14/19] android/socket: Close file descriptor after sending Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 15/19] android/socket: Add SDP record for OPP profile Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 16/19] android/socket: Add MAS uuid to profile table Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 17/19] android/socket: Add SPP " Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 18/19] android/socket: Add PBAP SDP record Andrei Emeltchenko
2013-11-20 10:24 ` [PATCHv6 19/19] android/socket: Add SPP " 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=1384943077-5366-3-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).