[PATCH 1/4] gatt: Add new sharacteristic functionality

[PATCH 1/4] gatt: Add new sharacteristic functionality

[Marcin Kraglak]

It will attach characteristic declaration and value, and return value
handle. It is needed to pass service handle to which this characteristic
will be added. If there is not enough free handles in service, 0 will be
returned.
---
 src/shared/gatt-db.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/shared/gatt-db.h | 15 +++++++++
 2 files changed, 110 insertions(+)

diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index a211cda..91590d3 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -28,10 +28,14 @@
 #include "src/shared/queue.h"
 #include "src/shared/gatt-db.h"
 
+#define MAX_CHAR_DECL_VALUE_LEN 19
+
 static const bt_uuid_t primary_service_uuid = { .type = BT_UUID16,
 					.value.u16 = GATT_PRIM_SVC_UUID };
 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 };
 
 struct gatt_db {
 	uint16_t next_handle;
@@ -43,6 +47,10 @@ struct gatt_db_attribute {
 	bt_uuid_t uuid;
 	uint16_t val_len;
 	uint8_t value[0];
+	uint8_t permissions;
+	gatt_db_read_t read_func;
+	gatt_db_write_t write_func;
+	void *user_data;
 };
 
 struct gatt_db_service {
@@ -191,3 +199,90 @@ bool gatt_db_remove_service(struct gatt_db *db, uint16_t handle)
 
 	return true;
 }
+
+static uint16_t get_attribute_index(struct gatt_db_service *service,
+							int end_offset)
+{
+	int i = 0;
+
+	while (i < service->num_handles - end_offset && service->attributes[i])
+		i++;
+
+	return i == service->num_handles - end_offset ? 0 : i;
+}
+
+static uint16_t get_handle_at_index(struct gatt_db_service *service,
+								int index)
+{
+	return service->attributes[index]->handle;
+}
+
+static uint16_t update_attribute_handle(struct gatt_db_service *service,
+								int index)
+{
+	uint16_t previous_handle;
+
+	previous_handle = service->attributes[index - 1]->handle;
+	service->attributes[index]->handle = previous_handle + 1;
+
+	return service->attributes[index]->handle;
+}
+
+static void set_attribute_data(struct gatt_db_attribute *attribute,
+						gatt_db_read_t read_func,
+						gatt_db_write_t write_func,
+						uint8_t permissions,
+						void *user_data)
+{
+	attribute->permissions = permissions;
+	attribute->read_func = read_func;
+	attribute->write_func = write_func;
+	attribute->user_data = user_data;
+}
+
+uint16_t gatt_db_new_characteristic(struct gatt_db *db, uint16_t handle,
+						const bt_uuid_t *uuid,
+						uint8_t permissions,
+						uint8_t properties,
+						gatt_db_read_t read_func,
+						gatt_db_write_t write_func,
+						void *user_data)
+{
+	uint8_t value[MAX_CHAR_DECL_VALUE_LEN];
+	struct gatt_db_service *service;
+	uint16_t len = 0;
+	int i;
+
+	service = queue_find(db->services, match_service_by_handle,
+							INT_TO_PTR(handle));
+	if (!service)
+		return 0;
+
+	i = get_attribute_index(service, 1);
+	if (!i)
+		return 0;
+
+	value[0] = properties;
+	len += sizeof(properties);
+	put_le16(get_handle_at_index(service, i - 1) + 2, &value[1]);
+	len += sizeof(uint16_t);
+	len += uuid_to_le(uuid, &value[3]);
+
+	service->attributes[i] = new_attribute(&characteristic_uuid, value,
+									len);
+	if (!service->attributes[i])
+		return 0;
+
+	update_attribute_handle(service, i++);
+
+	service->attributes[i] = new_attribute(uuid, NULL, 0);
+	if (!service->attributes[i]) {
+		free(service->attributes[i - 1]);
+		return 0;
+	}
+
+	set_attribute_data(service->attributes[i], read_func, write_func,
+							permissions, user_data);
+
+	return update_attribute_handle(service, i);
+}
diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h
index b014b17..9ee1a08 100644
--- a/src/shared/gatt-db.h
+++ b/src/shared/gatt-db.h
@@ -29,3 +29,18 @@ void gatt_db_destroy(struct gatt_db *db);
 uint16_t gatt_db_add_service(struct gatt_db *db, const bt_uuid_t *uuid,
 					bool primary, uint16_t num_handles);
 bool gatt_db_remove_service(struct gatt_db *db, uint16_t handle);
+
+typedef void (*gatt_db_read_t) (uint16_t handle, const bdaddr_t *bdaddr,
+				uint16_t request_id, void *user_data);
+
+typedef void (*gatt_db_write_t)  (uint16_t handle, const bdaddr_t *bdaddr,
+				uint16_t request_id, const uint8_t *value,
+								size_t len);
+
+uint16_t gatt_db_new_characteristic(struct gatt_db *db, uint16_t handle,
+						const bt_uuid_t *uuid,
+						uint8_t permissions,
+						uint8_t properties,
+						gatt_db_read_t read_func,
+						gatt_db_write_t write_func,
+						void *user_data);
-- 
1.8.5.3

[PATCH 2/4] gatt: Add characteristic descriptor functionality

[Marcin Kraglak]

It will add characteristic descriptor to service attribute's list.
Returns 0 if there is no free handle in service or descriptor's handle
if attribute has been added successfully.
---
 src/shared/gatt-db.c | 29 +++++++++++++++++++++++++++++
 src/shared/gatt-db.h |  7 +++++++
 2 files changed, 36 insertions(+)

diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index 91590d3..a0f860c 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -286,3 +286,32 @@ uint16_t gatt_db_new_characteristic(struct gatt_db *db, uint16_t handle,
 
 	return update_attribute_handle(service, i);
 }
+
+uint16_t gatt_db_new_char_descriptor(struct gatt_db *db, uint16_t handle,
+						const bt_uuid_t *uuid,
+						uint8_t permissions,
+						gatt_db_read_t read_func,
+						gatt_db_write_t write_func,
+						void *user_data)
+{
+	struct gatt_db_service *service;
+	int i;
+
+	service = queue_find(db->services, match_service_by_handle,
+							INT_TO_PTR(handle));
+	if (!service)
+		return 0;
+
+	i = get_attribute_index(service, 0);
+	if (!i)
+		return 0;
+
+	service->attributes[i] = new_attribute(uuid, NULL, 0);
+	if (!service->attributes[i])
+		return 0;
+
+	set_attribute_data(service->attributes[i], read_func, write_func,
+							permissions, user_data);
+
+	return update_attribute_handle(service, i);
+}
diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h
index 9ee1a08..281ae6a 100644
--- a/src/shared/gatt-db.h
+++ b/src/shared/gatt-db.h
@@ -44,3 +44,10 @@ uint16_t gatt_db_new_characteristic(struct gatt_db *db, uint16_t handle,
 						gatt_db_read_t read_func,
 						gatt_db_write_t write_func,
 						void *user_data);
+
+uint16_t gatt_db_new_char_descriptor(struct gatt_db *db, uint16_t handle,
+						const bt_uuid_t *uuid,
+						uint8_t permissions,
+						gatt_db_read_t read_func,
+						gatt_db_write_t write_func,
+						void *user_data);
-- 
1.8.5.3

[PATCH 3/4] gatt: Add included service functionality

[Marcin Kraglak]

It will add included service to service attribute list. It will first
look for included service and then create attribute. In case of error
or if there is no free handle, 0 will be returned.
---
 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 a0f860c..abb5f61 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;
@@ -315,3 +318,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));
+
+	if (!included_service)
+		return 0;
+
+	put_le16(included_handle, &value[0]);
+	put_le16(included_handle + included_service->num_handles - 1,
+							&value[2]);
+	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 281ae6a..cdbbf36 100644
--- a/src/shared/gatt-db.h
+++ b/src/shared/gatt-db.h
@@ -51,3 +51,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);
+
+uint16_t gatt_db_new_included_service(struct gatt_db *db, uint16_t handle,
+						uint16_t included_handle);
-- 
1.8.5.3

[PATCH 4/4] gatt: Add start/stop service functionality

[Marcin Kraglak]

These functions will set active flag in database. Only active
services can be read by client from database.
---
 src/shared/gatt-db.c | 29 +++++++++++++++++++++++++++++
 src/shared/gatt-db.h |  4 ++++
 2 files changed, 33 insertions(+)

diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index abb5f61..14c7159 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -57,6 +57,7 @@ struct gatt_db_attribute {
 };
 
 struct gatt_db_service {
+	bool active;
 	uint16_t num_handles;
 	struct gatt_db_attribute **attributes;
 };
@@ -359,3 +360,31 @@ uint16_t gatt_db_new_included_service(struct gatt_db *db, uint16_t handle,
 
 	return update_attribute_handle(service, index);
 }
+
+bool gatt_db_start_service(struct gatt_db *db, uint16_t handle)
+{
+	struct gatt_db_service *service;
+
+	service = queue_find(db->services, match_service_by_handle,
+							INT_TO_PTR(handle));
+	if (!service)
+		return false;
+
+	service->active = true;
+
+	return true;
+}
+
+bool gatt_db_stop_service(struct gatt_db *db, uint16_t handle)
+{
+	struct gatt_db_service *service;
+
+	service = queue_find(db->services, match_service_by_handle,
+							INT_TO_PTR(handle));
+	if (!service)
+		return false;
+
+	service->active = false;
+
+	return true;
+}
diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h
index cdbbf36..040c3fb 100644
--- a/src/shared/gatt-db.h
+++ b/src/shared/gatt-db.h
@@ -54,3 +54,7 @@ uint16_t gatt_db_new_char_descriptor(struct gatt_db *db, uint16_t handle,
 
 uint16_t gatt_db_new_included_service(struct gatt_db *db, uint16_t handle,
 						uint16_t included_handle);
+
+bool gatt_db_start_service(struct gatt_db *db, uint16_t handle);
+
+bool gatt_db_stop_service(struct gatt_db *db, uint16_t handle);
-- 
1.8.5.3

Re: [PATCH 1/4] gatt: Add new sharacteristic functionality

[Szymon Janc]

On Friday 25 of April 2014 11:01:09 Marcin Kraglak wrote:
> It will attach characteristic declaration and value, and return value
> handle. It is needed to pass service handle to which this characteristic
> will be added. If there is not enough free handles in service, 0 will be
> returned.
> ---

There is a typo in commit title 'sharacteristic'.

>  src/shared/gatt-db.c | 95
> ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/shared/gatt-db.h |
> 15 +++++++++
>  2 files changed, 110 insertions(+)
> 
> diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
> index a211cda..91590d3 100644
> --- a/src/shared/gatt-db.c
> +++ b/src/shared/gatt-db.c
> @@ -28,10 +28,14 @@
>  #include "src/shared/queue.h"
>  #include "src/shared/gatt-db.h"
> 
> +#define MAX_CHAR_DECL_VALUE_LEN 19
> +
>  static const bt_uuid_t primary_service_uuid = { .type = BT_UUID16,
>  					.value.u16 = GATT_PRIM_SVC_UUID };
>  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 };
> 
>  struct gatt_db {
>  	uint16_t next_handle;
> @@ -43,6 +47,10 @@ struct gatt_db_attribute {
>  	bt_uuid_t uuid;
>  	uint16_t val_len;
>  	uint8_t value[0];
> +	uint8_t permissions;
> +	gatt_db_read_t read_func;
> +	gatt_db_write_t write_func;
> +	void *user_data;
>  };
> 
>  struct gatt_db_service {
> @@ -191,3 +199,90 @@ bool gatt_db_remove_service(struct gatt_db *db,
> uint16_t handle)
> 
>  	return true;
>  }
> +
> +static uint16_t get_attribute_index(struct gatt_db_service *service,
> +							int end_offset)
> +{
> +	int i = 0;
> +
> +	while (i < service->num_handles - end_offset && service->attributes[i])
> +		i++;

Some braces here would improve really readability. Also a comment here would 
be nice.

> +
> +	return i == service->num_handles - end_offset ? 0 : i;
> +}

Same here.

> +
> +static uint16_t get_handle_at_index(struct gatt_db_service *service,
> +								int index)
> +{
> +	return service->attributes[index]->handle;
> +}
> +
> +static uint16_t update_attribute_handle(struct gatt_db_service *service,
> +								int index)
> +{
> +	uint16_t previous_handle;
> +
> +	previous_handle = service->attributes[index - 1]->handle;

Add a comment why this is safe.

> +	service->attributes[index]->handle = previous_handle + 1;
> +
> +	return service->attributes[index]->handle;
> +}
> +
> +static void set_attribute_data(struct gatt_db_attribute *attribute,
> +						gatt_db_read_t read_func,
> +						gatt_db_write_t write_func,
> +						uint8_t permissions,
> +						void *user_data)
> +{
> +	attribute->permissions = permissions;
> +	attribute->read_func = read_func;
> +	attribute->write_func = write_func;
> +	attribute->user_data = user_data;
> +}
> +
> +uint16_t gatt_db_new_characteristic(struct gatt_db *db, uint16_t handle,
> +						const bt_uuid_t *uuid,
> +						uint8_t permissions,
> +						uint8_t properties,
> +						gatt_db_read_t read_func,
> +						gatt_db_write_t write_func,
> +						void *user_data)
> +{
> +	uint8_t value[MAX_CHAR_DECL_VALUE_LEN];
> +	struct gatt_db_service *service;
> +	uint16_t len = 0;
> +	int i;
> +
> +	service = queue_find(db->services, match_service_by_handle,
> +							INT_TO_PTR(handle));
> +	if (!service)
> +		return 0;
> +
> +	i = get_attribute_index(service, 1);
> +	if (!i)
> +		return 0;
> +
> +	value[0] = properties;
> +	len += sizeof(properties);
> +	put_le16(get_handle_at_index(service, i - 1) + 2, &value[1]);

Comment.

> +	len += sizeof(uint16_t);
> +	len += uuid_to_le(uuid, &value[3]);
> +
> +	service->attributes[i] = new_attribute(&characteristic_uuid, value,
> +									len);
> +	if (!service->attributes[i])
> +		return 0;
> +
> +	update_attribute_handle(service, i++);
> +
> +	service->attributes[i] = new_attribute(uuid, NULL, 0);
> +	if (!service->attributes[i]) {
> +		free(service->attributes[i - 1]);
> +		return 0;
> +	}
> +
> +	set_attribute_data(service->attributes[i], read_func, write_func,
> +							permissions, user_data);
> +
> +	return update_attribute_handle(service, i);
> +}
> diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h
> index b014b17..9ee1a08 100644
> --- a/src/shared/gatt-db.h
> +++ b/src/shared/gatt-db.h
> @@ -29,3 +29,18 @@ void gatt_db_destroy(struct gatt_db *db);
>  uint16_t gatt_db_add_service(struct gatt_db *db, const bt_uuid_t *uuid,
>  					bool primary, uint16_t num_handles);
>  bool gatt_db_remove_service(struct gatt_db *db, uint16_t handle);
> +
> +typedef void (*gatt_db_read_t) (uint16_t handle, const bdaddr_t *bdaddr,
> +				uint16_t request_id, void *user_data);
> +
> +typedef void (*gatt_db_write_t)  (uint16_t handle, const bdaddr_t *bdaddr,
> +				uint16_t request_id, const uint8_t *value,
> +								size_t len);
> +
> +uint16_t gatt_db_new_characteristic(struct gatt_db *db, uint16_t handle,
> +						const bt_uuid_t *uuid,
> +						uint8_t permissions,
> +						uint8_t properties,
> +						gatt_db_read_t read_func,
> +						gatt_db_write_t write_func,
> +						void *user_data);

-- 
BR
Szymon Janc

Re: [PATCH 3/4] gatt: Add included service functionality

[Szymon Janc]

Hi Marcin,

On Friday 25 of April 2014 11:01:11 Marcin Kraglak wrote:
> It will add included service to service attribute list. It will first
> look for included service and then create attribute. In case of error
> or if there is no free handle, 0 will be returned.
> ---
>  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 a0f860c..abb5f61 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;
> @@ -315,3 +318,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)
> +{

Please keep convention of using add/remove in functions names when you 
add/remove stuff from db. (this applies to all other patches as well).

> +	struct gatt_db_service *included_service;
> +	uint8_t value[MAX_INCLUDED_VALUE_LEN];
> +	uint16_t len = sizeof(uint16_t) * 2;

I'd start from 0 and just increment when needed.

> +	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));
> +
> +	if (!included_service)
> +		return 0;
> +
> +	put_le16(included_handle, &value[0]);
> +	put_le16(included_handle + included_service->num_handles - 1,
> +							&value[2]);
> +	if (included_service->attributes[0]->val_len == 2) {

Comments. Also if that makes code more readable maybe it makes sense to define 
constants for that and avoid magic numbers in first place?

> +		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 281ae6a..cdbbf36 100644
> --- a/src/shared/gatt-db.h
> +++ b/src/shared/gatt-db.h
> @@ -51,3 +51,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);
> +
> +uint16_t gatt_db_new_included_service(struct gatt_db *db, uint16_t handle,
> +						uint16_t included_handle);

-- 
BR
Szymon Janc