LinuxLists.cc - [PATCHv2 00/16] Socket HAL

2013-11-15 14:37:42

Subject: [PATCHv2 00/16] Socket HAL

From: Andrei Emeltchenko <[email protected]>

This is initial code implementing socket HAL. OPP currently works with send/receive files. Probaly
other profiles works as well, not tested yet.

Changes:
* v2: Following Marcel comments changed way copying between file descriptors works, added SDP record
for OPP and now it is possible to send files through GUI. Merged one patch with structures with actual user.
* v1: Rebased and use static src address, hal_fd removed from structure and closed after sent to framework,
added connect calls and SDP parsing, added cleanup_rfcomm function, minor fixes.
* RFC Initial

TODO:
* Add SDP record for PBAP and other profiles
* Use splice() (requires bionic change first)

For tracking rfcomm sockets I use structure rfslot which has following
fields:
- real_sock - real RFCOMM socket
- fd - fd to communicate with Android framework

create_rfslot sets hal_fd which is fd passed to Android framework with CMSG

Andrei Emeltchenko (16):
android/hal-sock: Add debug flag printing
android/hal-sock: Use static local adapter address
android/hal-sock: Add connect signal to socket
android/hal-sock: Define structs and implement listen
android/hal-sock: Implement socket accepted event
android/hal-sock: Implement Android RFCOMM stack events
android/hal-sock: Implement RFCOMM events
android/hal-sock: Implement accept signal over Android fd
android/hal-sock: Write channel to Android fd
android/hal-sock: Implement socket connect HAL method
android/hal-sock: Parse SDP response and connect
android/hal-sock: Implement HAL connect call
android/hal-sock: Send RFCOMM channel to framework
android/hal-sock: Send connect signal on connect
android/hal-sock: Close file descriptor after sending
android/hal-sock: Add SDP record for OPP profile

android/hal-msg.h | 2 +
android/hal-sock.c | 8 +-
android/socket.c | 600 +++++++++++++++++++++++++++++++++++++++++++++++++++-
android/socket.h | 7 +
4 files changed, 609 insertions(+), 8 deletions(-)

--
1.7.10.4

2013-11-15 14:53:34

by Marcel Holtmann

[permalink] [raw]

Subject: Re: [PATCHv2 06/16] android/hal-sock: Implement Android RFCOMM stack events

Hi Andrei,

> Handle events from Android framework. Write everything to real RFCOMM
> socket. Consider splice() in the future.
> ---
> android/socket.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
>
> diff --git a/android/socket.c b/android/socket.c
> index c9ee32f..af14ef6 100644
> --- a/android/socket.c
> +++ b/android/socket.c
> @@ -115,9 +115,66 @@ static int get_rfcomm_default_chan(const uint8_t *uuid)
> return -1;
> }
>
> +static inline int write_n(int fd, unsigned char *buf, int len)
> +{
> + int t = 0, w;
> +
> + while (len > 0) {
> + if ((w = write(fd, buf, len)) < 0) {

this is not coding style we use.

Also we can limit the scope of w to the loop.

I also do not really like these kind of one letter variables unless they are used as iterators. So you better use written here or sent in case you actually want to use send() and not write().

> + if (errno == EINTR || errno == EAGAIN)
> + continue;
> + return -1;
> + }
> +
> + if (!w)
> + return 0;
> +
> + len -= w; buf += w; t += w;
> + }
> +
> + return t;

The variable name t is also unclear to me. What does it stand for.

> +}
> +
> static gboolean sock_stack_event_cb(GIOChannel *io, GIOCondition cond,
> gpointer data)
> {
> + struct rfcomm_slot *rfslot = data;
> + unsigned char buf[1024];
> + int len, sent;
> +
> + DBG("rfslot: fd %d real_sock %d chan %u sock %d",
> + rfslot->fd, rfslot->real_sock, rfslot->channel,
> + g_io_channel_unix_get_fd(io));
> +
> + if (!g_list_find(rfcomm_connected_list, rfslot)) {
> + error("rfslot %p not found in the list", rfslot);
> + return FALSE;
> + }
> +
> + if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
> + error("Socket error: sock %d cond %d",
> + g_io_channel_unix_get_fd(io), cond);
> + rfcomm_connected_list = g_list_remove(rfcomm_connected_list,
> + rfslot);
> + cleanup_rfslot(rfslot);
> + return FALSE;
> + }
> +
> + len = recv(rfslot->fd, buf, sizeof(buf), 0);
> + if (len <= 0) {
> + error("recv(): %s", strerror(errno));
> + return FALSE;
> + }
> +
> + DBG("read %d bytes write to %d", len, rfslot->real_sock);
> +
> + if ((sent = write_n(rfslot->real_sock, buf, len)) < 0) {

We do not use this coding style.

> + error("send(): %s", strerror(errno));
> + return FALSE;
> + }
> +
> + DBG("Written %d bytes", sent);
> +
> return TRUE;
> }

Regards

Marcel

2013-11-15 14:49:16

by Marcel Holtmann

[permalink] [raw]

Subject: Re: [PATCHv2 07/16] android/hal-sock: Implement RFCOMM events

Hi Andrei,

> Copy data from RFCOMM socket to Android framework. Consider splice
> in the future.
> ---
> android/socket.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/android/socket.c b/android/socket.c
> index af14ef6..fdd2e09 100644
> --- a/android/socket.c
> +++ b/android/socket.c
> @@ -181,6 +181,43 @@ static gboolean sock_stack_event_cb(GIOChannel *io, GIOCondition cond,
> static gboolean sock_rfcomm_event_cb(GIOChannel *io, GIOCondition cond,
> gpointer data)
> {
> + struct rfcomm_slot *rfslot = data;
> + unsigned char buf[1024];
> + int len, sent;
> +
> + DBG("rfslot: fd %d real_sock %d chan %u sock %d",
> + rfslot->fd, rfslot->real_sock, rfslot->channel,
> + g_io_channel_unix_get_fd(io));
> +
> + if (!g_list_find(rfcomm_connected_list, rfslot)) {
> + error("rfslot %p not found in the list", rfslot);
> + return FALSE;
> + }
> +
> + if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
> + error("Socket error: sock %d cond %d",
> + g_io_channel_unix_get_fd(io), cond);
> + rfcomm_connected_list = g_list_remove(rfcomm_connected_list,
> + rfslot);
> + cleanup_rfslot(rfslot);
> + return FALSE;
> + }
> +
> + len = recv(rfslot->real_sock, buf, sizeof(buf), 0);
> + if (len <= 0) {
> + error("recv(): %s sock %d", strerror(errno), rfslot->real_sock);
> + return FALSE;
> + }
> +
> + DBG("read %d bytes, write to fd %d", len, rfslot->fd);
> +
> + if ((sent = write_n(rfslot->fd, buf, len)) < 0) {

we do not use this coding style.

> + error("send(): %s", strerror(errno));
> + return FALSE;
> + }
> +
> + DBG("Written %d bytes", sent);
> +
> return TRUE;
> }

Regards

Marcel

2013-11-15 14:37:58

Subject: [PATCHv2 00/16] Socket HAL

Subject: Re: [PATCHv2 06/16] android/hal-sock: Implement Android RFCOMM stack events

Subject: Re: [PATCHv2 07/16] android/hal-sock: Implement RFCOMM events

Subject: [PATCHv2 16/16] android/hal-sock: Add SDP record for OPP profile

Subject: [PATCHv2 14/16] android/hal-sock: Send connect signal on connect

Subject: [PATCHv2 15/16] android/hal-sock: Close file descriptor after sending

Subject: [PATCHv2 13/16] android/hal-sock: Send RFCOMM channel to framework

Subject: [PATCHv2 10/16] android/hal-sock: Implement socket connect HAL method

Subject: [PATCHv2 05/16] android/hal-sock: Implement socket accepted event

Subject: [PATCHv2 06/16] android/hal-sock: Implement Android RFCOMM stack events

Subject: [PATCHv2 11/16] android/hal-sock: Parse SDP response and connect

Subject: [PATCHv2 12/16] android/hal-sock: Implement HAL connect call

Subject: [PATCHv2 08/16] android/hal-sock: Implement accept signal over Android fd

Subject: [PATCHv2 09/16] android/hal-sock: Write channel to Android fd

Subject: [PATCHv2 02/16] android/hal-sock: Use static local adapter address

Subject: [PATCHv2 07/16] android/hal-sock: Implement RFCOMM events

Subject: [PATCHv2 01/16] android/hal-sock: Add debug flag printing

Subject: [PATCHv2 04/16] android/hal-sock: Define structs and implement listen

Subject: [PATCHv2 03/16] android/hal-sock: Add connect signal to socket