Return-Path: <cyrus@holtmann.org>
MIME-Version: 1.0
In-Reply-To: <1397027234-12003-8-git-send-email-marcin.kraglak@tieto.com>
References: <1397027234-12003-1-git-send-email-marcin.kraglak@tieto.com>
	<1397027234-12003-8-git-send-email-marcin.kraglak@tieto.com>
Date: Tue, 15 Apr 2014 09:53:30 -0300
Message-ID: <CAKT1EBd4GK++1NGeBSXWieHx=2N642YwJfJApjKFerfmCToHbQ@mail.gmail.com>
Subject: Re: [RFC 07/16] gatt: Add included service functionality
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
To: Marcin Kraglak <marcin.kraglak@tieto.com>
Cc: BlueZ development <linux-bluetooth@vger.kernel.org>
Content-Type: text/plain; charset=UTF-8
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

Hi Marcin,

On Wed, Apr 9, 2014 at 4:07 AM, Marcin Kraglak <marcin.kraglak@tieto.com> wrote:
> It will add included service to service attribute list.
> ---
>  src/shared/gatt-db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
>  src/shared/gatt-db.h |  3 +++
>  2 files changed, 47 insertions(+)
>
> diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
> index 26b36d9..2886bb8 100644
> --- a/src/shared/gatt-db.c
> +++ b/src/shared/gatt-db.c
> @@ -29,6 +29,7 @@
>  #include "src/shared/gatt-db.h"
>
>  #define MAX_CHAR_DECL_VALUE_LEN 19
> +#define MAX_INCLUDED_VALUE_LEN 6
>
>  static const bt_uuid_t primary_service_uuid  = { .type = BT_UUID16,
>                                         .value.u16 = GATT_PRIM_SVC_UUID };
> @@ -36,6 +37,8 @@ static const bt_uuid_t secondary_service_uuid  = { .type = BT_UUID16,
>                                         .value.u16 = GATT_SND_SVC_UUID };
>  static const bt_uuid_t characteristic_uuid = { .type = BT_UUID16,
>                                         .value.u16 = GATT_CHARAC_UUID };
> +static const bt_uuid_t included_service_uuid = { .type = BT_UUID16,
> +                                       .value.u16 = GATT_INCLUDE_UUID };
>
>  struct gatt_db {
>         uint16_t next_handle;
> @@ -314,3 +317,44 @@ uint16_t gatt_db_new_char_descriptor(struct gatt_db *db, uint16_t handle,
>
>         return update_attribute_handle(service, i);
>  }
> +
> +uint16_t gatt_db_new_included_service(struct gatt_db *db, uint16_t handle,
> +                                               uint16_t included_handle)
> +{
> +       struct gatt_db_service *included_service;
> +       uint8_t value[MAX_INCLUDED_VALUE_LEN];
> +       uint16_t len = sizeof(uint16_t) * 2;
> +       struct gatt_db_service *service;
> +       int index;
> +
> +       service = queue_find(db->services, match_service_by_handle,
> +                                                       INT_TO_PTR(handle));
> +       if (!service)
> +               return 0;
> +
> +       included_service = queue_find(db->services, match_service_by_handle,
> +                                               INT_TO_PTR(included_handle));

Circular references may occur.

> +
> +       if (!included_service)
> +               return 0;
> +
> +       put_le16(included_handle, &value[0]);
> +       put_le16(included_handle + included_service->num_handles - 1,
> +                                                       &value[2]);

According to the BT core spec:
"The Service UUID shall only be present when the UUID is a 16-bit
Bluetooth UUID"

It'd be relevant to add this comment here.

> +       if (included_service->attributes[0]->val_len == 2) {
> +               memcpy(&value[4], included_service->attributes[0]->value,
> +                               included_service->attributes[0]->val_len);
> +               len += included_service->attributes[0]->val_len;
> +       }
> +
> +       index = get_attribute_index(service, 1);
> +       if (!index)
> +               return 0;
> +
> +       service->attributes[index] = new_attribute(&included_service_uuid,
> +                                                               value, len);
> +       if (!service->attributes[index])
> +               return 0;
> +
> +       return update_attribute_handle(service, index);
> +}
> diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h
> index 1191614..a421e9e 100644
> --- a/src/shared/gatt-db.h
> +++ b/src/shared/gatt-db.h
> @@ -58,3 +58,6 @@ uint16_t gatt_db_new_char_descriptor(struct gatt_db *db, uint16_t handle,
>                                                 gatt_db_read_t read_func,
>                                                 gatt_db_write_t write_func,
>                                                 void *user_data);
> +

Please add a brief description here

> +uint16_t gatt_db_new_included_service(struct gatt_db *db, uint16_t handle,
> +                                               uint16_t included_handle);
> --
> 1.8.5.3
>

Claudio