Hi Andrei,
On Friday 27 of June 2014 14:25:00 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
>
> Reply received buffer back for ECHO service.
> ---
> android/health.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 62 insertions(+), 1 deletion(-)
>
> diff --git a/android/health.c b/android/health.c
> index 4f15f93..9631d9e 100644
> --- a/android/health.c
> +++ b/android/health.c
> @@ -1054,9 +1054,70 @@ static int get_dcpsm(sdp_list_t *recs, uint16_t *dcpsm)
> return -1;
> }
>
> +static int send_echo_data(int sock, const void *buf, uint32_t size)
> +{
> + const uint8_t *buf_b = buf;
> + uint32_t sent = 0;
> +
> + while (sent < size) {
> + int n = write(sock, buf_b + sent, size - sent);
> + if (n < 0)
> + return -1;
> + sent += n;
> + }
> +
> + return 0;
> +}
> +
> +static gboolean serve_echo(GIOChannel *io, GIOCondition cond, gpointer data)
> +{
> + struct health_channel *channel = data;
> + uint8_t buf[MCAP_DC_MTU];
> + int fd, len;
> +
> + DBG("channel %p", channel);
> +
> + if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
> + DBG("Error condition on channel");
> + return FALSE;
> + }
> +
> + fd = g_io_channel_unix_get_fd(io);
> +
> + len = read(fd, buf, sizeof(buf));
> + if (len < 0)
> + goto fail;
> +
> + if (send_echo_data(fd, buf, len) >= 0)
> + return TRUE;
Shouldn't initiator send only one single data packet in echo test function?
> +
> +fail:
> + free_health_device(channel->dev);
Wouldn't that leave dangling pointer in channel? Also, why is this free here?
> + return FALSE;
> +}
> +
> static void mcap_mdl_connected_cb(struct mcap_mdl *mdl, void *data)
> {
> - DBG("Not Implemeneted");
> + struct health_channel *channel = data;
> +
> + if (!channel->mdl)
> + channel->mdl = mcap_mdl_ref(mdl);
> +
> + DBG("Data channel connected: mdl %p channel %p", mdl, channel);
> +
> + if (channel->mdep_id == HDP_MDEP_ECHO) {
> + GIOChannel *io;
> + int fd;
> +
> + fd = mcap_mdl_get_fd(channel->mdl);
> + if (fd < 0)
> + return;
> +
> + io = g_io_channel_unix_new(fd);
> + g_io_add_watch(io, G_IO_ERR | G_IO_HUP | G_IO_NVAL | G_IO_IN,
> + serve_echo, channel);
> + g_io_channel_unref(io);
> + }
> }
>
> static void mcap_mdl_closed_cb(struct mcap_mdl *mdl, void *data)
>
--
Best regards,
Szymon Janc
--
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
