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

2013-11-14 15:11:39

Subject: [PATCHv1 00/16] Socket HAL

From: Andrei Emeltchenko <[email protected]>

This is initial code implementing socket HAL. Receiving files
through OPP currently works.

Changes:
* 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

For tracking rfcomm sockets I use structure rfslot which has following
fields:
- real_sock - real RFCOMM socket
- fd - fd to communicate with Android framework
- hal_fd - 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 structures for socket HAL
android/hal-sock: Initial listen handle
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-msg.h | 2 +
android/hal-sock.c | 8 +-
android/socket.c | 496 +++++++++++++++++++++++++++++++++++++++++++++++++++-
android/socket.h | 7 +
4 files changed, 505 insertions(+), 8 deletions(-)

--
1.7.10.4

2013-11-15 12:29:10

by Luiz Augusto von Dentz

[permalink] [raw]

Subject: Re: [PATCHv1 04/16] android/hal-sock: Define structures for socket HAL

Hi Andrei,

On Thu, Nov 14, 2013 at 5:11 PM, Andrei Emeltchenko
<[email protected]> wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> This defines structures for socket HAL. We need to emulate Android
> sockets by sending connect/accept signals over file descriptor.
> ---
> android/socket.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/android/socket.c b/android/socket.c
> index e580036..4699dce 100644
> --- a/android/socket.c
> +++ b/android/socket.c
> @@ -37,6 +37,18 @@
>
> static bdaddr_t adapter_addr;
>
> +/* Simple list of RFCOMM server sockets */
> +GList *rfcomm_srv_list = NULL;
> +
> +/* Simple list of RFCOMM connected sockets */
> +GList *rfcomm_connected_list = NULL;
> +
> +struct rfcomm_slot {
> + int fd; /* descriptor for communication with Java framework */
> + int real_sock; /* real RFCOMM socket */
> + int channel; /* RFCOMM channel */
> +};

Here you don't really need to define channel as int do you? Also if in
future we want to replace this with splice this should use a pipe to
communicate with the HAL.

Btw, introducing lists and struct without any implementation is never
very good to review, because I have no idea in what context they will
be used.

--
Luiz Augusto von Dentz

2013-11-15 09:32:13

by Marcel Holtmann

[permalink] [raw]

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

Hi Andrei,

>>> Handle events from Android framework. Write everything to real RFCOMM
>>> socket.
>>> ---
>>> android/socket.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 42 insertions(+)
>>>
>>> diff --git a/android/socket.c b/android/socket.c
>>> index c9ee32f..07743f6 100644
>>> --- a/android/socket.c
>>> +++ b/android/socket.c
>>> @@ -118,6 +118,48 @@ static int get_rfcomm_default_chan(const uint8_t *uuid)
>>> static gboolean sock_stack_event_cb(GIOChannel *io, GIOCondition cond,
>>> gpointer data)
>>> {
>>> + struct rfcomm_slot *rfslot = data;
>>> + unsigned char buf[1024] = { 0 };
>>
>> since why are we doing this { 0 } thing?
>>
>>> + 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;
>>> + }
>>> +
>>> + /* FIXME check fd vs sock(io) */
>>
>> I do not even understand this FIXME. Why not get it right in the fist place.
>>
>>> + 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);
>>> +
>>> + sent = send(rfslot->real_sock, buf, len, 0);
>>> + if (sent < 0) {
>>> + error("send(): %s", strerror(errno));
>>> + return FALSE;
>>> + }
>>> +
>>> + if (sent != len) {
>>> + error("send(): sent %d bytes out of %d", sent, len);
>>> + return FALSE;
>>> + }
>>
>> Only problem is still that we now abort on errors like EINTR or EAGAIN. That is not what we want either.
>>
>
> So shall we retry to send the several (say 3) times here?

you can have partial success here as well. You need to keep sending until you succeeded or get other errors then the ones mentioned above.

Regards

Marcel

2013-11-15 09:23:19

Subject: [PATCHv1 00/16] Socket HAL

Subject: Re: [PATCHv1 04/16] android/hal-sock: Define structures for socket HAL

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

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

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

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

Subject: [PATCHv1 13/16] android/hal-sock: Implement HAL connect call

Subject: [PATCHv1 05/16] android/hal-sock: Initial listen handle

Subject: [PATCHv1 04/16] android/hal-sock: Define structures for socket HAL

Subject: [PATCHv1 08/16] android/hal-sock: Implement RFCOMM events

Subject: [PATCHv1 12/16] android/hal-sock: Parse SDP response and connect

Subject: [PATCHv1 15/16] android/hal-sock: Send connect signal on connect

Subject: [PATCHv1 14/16] android/hal-sock: Send RFCOMM channel to framework

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

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

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

Subject: [PATCHv1 07/16] android/hal-sock: Implement Android RFCOMM stack events

Subject: [PATCHv1 11/16] android/hal-sock: Implement socket connect HAL method

Subject: [PATCHv1 10/16] android/hal-sock: Write channel to Android fd

Subject: [PATCHv1 06/16] android/hal-sock: Implement socket accepted event

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