Hi,
On 10 April 2014 10:42, Lukasz Rymanowski <lukasz.rymanowski@xxxxxxxxx> wrote:
> This patch adds handling client listen support
> ---
> android/gatt.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 146 insertions(+), 2 deletions(-)
>
> diff --git a/android/gatt.c b/android/gatt.c
> index e10324e..df9c675 100644
> --- a/android/gatt.c
> +++ b/android/gatt.c
> @@ -121,6 +121,12 @@ struct gatt_device {
> guint watch_id;
> };
>
> +struct gatt_listen {
> + struct queue *clients;
> +
> + GIOChannel *att_io;
> +};
> +
> static struct ipc *hal_ipc = NULL;
> static bdaddr_t adapter_addr;
> static bool scanning = false;
> @@ -131,6 +137,10 @@ static struct queue *conn_list = NULL; /* Connected devices */
> static struct queue *conn_wait_queue = NULL; /* Devs waiting to connect */
> static struct queue *disc_dev_list = NULL; /* Disconnected devices */
>
> +static struct gatt_listen listen_clients;
> +
> +static uint32_t conn_id = 0;
> +
> static void bt_le_discovery_stop_cb(void);
>
> static void android2uuid(const uint8_t *uuid, bt_uuid_t *dst)
> @@ -815,7 +825,6 @@ static void connect_cb(GIOChannel *io, GError *gerr, gpointer user_data)
> struct gatt_device *dev;
> struct hal_ev_gatt_client_connect ev;
> GAttrib *attrib;
> - static uint32_t conn_id = 0;
> int32_t status;
>
> /* Take device from conn waiting queue */
> @@ -1200,12 +1209,147 @@ reply:
> put_device_on_disc_list(dev);
> }
>
> +static void copy_client_to_dev(void *data, void *user_data)
> +{
> + int32_t *client_id = data;
> + struct gatt_device *dev = user_data;
> +
> + if (!queue_push_tail(dev->clients, client_id))
> + error("gatt: Could not copy client to dev->clients");
> +}
> +
> +static void connect_event(GIOChannel *io, GError *gerr, void *user_data)
> +{
> + struct gatt_device *dev = NULL;
> + struct hal_ev_gatt_client_connect ev;
> + GAttrib *attrib;
> + uint8_t dst_type;
> + bdaddr_t src, dst;
> +
> + DBG("");
> +
> + if (gerr) {
> + error("gatt: %s", gerr->message);
> + g_error_free(gerr);
> + ev.status = GATT_FAILURE;
> + goto done;
> + }
> +
> + bt_io_get(io, &gerr,
> + BT_IO_OPT_SOURCE_BDADDR, &src,
> + BT_IO_OPT_DEST_BDADDR, &dst,
> + BT_IO_OPT_DEST_TYPE, &dst_type,
> + BT_IO_OPT_INVALID);
> + if (gerr) {
> + error("gatt: bt_io_get: %s", gerr->message);
> + g_error_free(gerr);
> + ev.status = GATT_FAILURE;
> + goto done;
> + }
> +
> + dev = create_device(&dst);
> + if (!dev) {
> + ev.status = GATT_FAILURE;
> + dev = NULL;
this is not needed of course :)
> + goto done;
> + }
> +
> + dev->bdaddr_type = dst_type;
> +
> + /* Set address and client id in the event */
> + bdaddr2android(&dev->bdaddr, &ev.bda);
> +
> + attrib = g_attrib_new(io);
> + if (!attrib) {
> + error("gatt: unable to create new GAttrib instance");
> + ev.status = GATT_FAILURE;
> + destroy_device(dev);
> + dev = NULL;
> + goto done;
> + }
> +
> + dev->attrib = attrib;
> + dev->watch_id = g_io_add_watch(io, G_IO_HUP | G_IO_ERR | G_IO_NVAL,
> + disconnected_cb, dev);
> + dev->conn_id = ++conn_id;
> +
> + ev.status = GATT_SUCCESS;
> +
> +done:
> + /* Only in success case we have valid conn_id */
> + ev.conn_id = ev.status == GATT_SUCCESS ? dev->conn_id : 0;
> +
> + queue_foreach(listen_clients.clients, send_client_connect_notify, &ev);
> +
> + if (ev.status != GATT_SUCCESS)
> + return;
> +
> + /*copy list of clients to device and clear listen */
> + queue_foreach(listen_clients.clients, copy_client_to_dev, dev);
> +
> + queue_remove_all(listen_clients.clients, NULL, NULL, NULL);
> + listen_clients.att_io = NULL;
> +
> + /*TODO: Attach to attrib db */
> +}
> +
> static void handle_client_listen(const void *buf, uint16_t len)
> {
> + const struct hal_cmd_gatt_client_listen *cmd = buf;
> + struct hal_ev_gatt_client_listen ev;
> + uint8_t status;
> + GError *gerr;
> +
> DBG("");
>
> + if (!queue_push_tail(listen_clients.clients,
> + INT_TO_PTR(cmd->client_if))) {
> + error("gatt: Could not put client on the listen list");
> + status = HAL_STATUS_FAILED;
> + goto reply;
> + }
> +
> + /* Do not be confused with server_if here. This is some typo in android
> + * headers.
> + */
> + ev.server_if = cmd->client_if;
> +
> + if (listen_clients.att_io) {
> + /* There is already listening socket on. just return success */
> + status = HAL_STATUS_SUCCESS;
> + ev.status = GATT_SUCCESS;
> + goto reply;
> + }
> +
> + status = HAL_STATUS_SUCCESS;
> +
> + listen_clients.att_io = bt_io_listen(connect_event, NULL,
> + &listen_clients.att_io, NULL, &gerr,
> + BT_IO_OPT_SOURCE_BDADDR, adapter_addr,
> + BT_IO_OPT_SOURCE_TYPE, BDADDR_LE_PUBLIC,
> + BT_IO_OPT_CID, ATT_CID,
> + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
> + BT_IO_OPT_INVALID);
> +
> + if (listen_clients.att_io == NULL) {
> + error("%s", gerr->message);
> + g_error_free(gerr);
> + ev.status = GATT_FAILURE;
> + }
> +
> + /*TODO: Start advertising */
> +reply:
> ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT, HAL_OP_GATT_CLIENT_LISTEN,
> - HAL_STATUS_FAILED);
> + status);
> +
> + /* If listen command succeed, send listen notification as well.
> + * Android expects that.
> + */
> + if (!status)
> + ipc_send_notif(hal_ipc, HAL_SERVICE_ID_GATT,
> + HAL_EV_GATT_CLIENT_LISTEN,
> + sizeof(ev), &ev);
> +
> }
>
> static void handle_client_refresh(const void *buf, uint16_t len)
> --
> 1.8.4
>
\Lukasz
--
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
