korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-30 22:33:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

shared/gatt: Allocate separate memory for attribute value

Browse Source 
This is not a packed structure mapping memory where using zero sized
array would be useful. Simply use pointer and allocate memory for
value.
This commit is contained in:
Szymon Janc 2014-04-26 15:30:24 +02:00
parent ee82dda599
commit 0538b3b975
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/shared/gatt-db.c
View File

@ -49,11 +49,12 @@ struct gatt_db_attribute {
uint16_t handle;
bt_uuid_t uuid;
uint8_t permissions;
uint16_t value_len;
uint8_t *value;
gatt_db_read_t read_func;
gatt_db_write_t write_func;
void *user_data;
uint16_t val_len;
uint8_t value[0];
};
struct gatt_db_service {
@ -69,6 +70,39 @@ static bool match_service_by_handle(const void *data, const void *user_data)
return service->attributes[0]->handle == PTR_TO_INT(user_data);
}
static struct gatt_db_attribute *new_attribute(const bt_uuid_t *type,
const uint8_t *val,
uint16_t len)
{
struct gatt_db_attribute *attribute;
attribute = new0(struct gatt_db_attribute, 1);
if (!attribute)
return NULL;
attribute->uuid = *type;
attribute->value_len = len;
if (len) {
attribute->value = malloc0(len);
if (!attribute->value) {
free(attribute);
return NULL;
}
memcpy(attribute->value, val, len);
}
return attribute;
}
static void attribute_destroy(void *data)
{
struct gatt_db_attribute *attribute = data;
free(attribute->value);
free(attribute);
}
struct gatt_db *gatt_db_new(void)
{
struct gatt_db *db;
@ -94,7 +128,7 @@ static void gatt_db_service_destroy(void *data)
int i;
for (i = 0; i < service->num_handles; i++)
free(service->attributes[i]);
attribute_destroy(service->attributes[i]);
free(service->attributes);
free(service);
@ -106,24 +140,6 @@ void gatt_db_destroy(struct gatt_db *db)
free(db);
}
static struct gatt_db_attribute *new_attribute(const bt_uuid_t *type,
const uint8_t *val,
uint16_t len)
{
struct gatt_db_attribute *attribute;
attribute = malloc0(sizeof(struct gatt_db_attribute) + len);
if (!attribute)
return NULL;
attribute->uuid = *type;
attribute->val_len = len;
if (len)
memcpy(&attribute->value, val, len);
return attribute;
}
static int uuid_to_le(const bt_uuid_t *uuid, uint8_t *dst)
{
bt_uuid_t uuid128;
@ -354,10 +370,10 @@ uint16_t gatt_db_add_included_service(struct gatt_db *db, uint16_t handle,
/* The Service UUID shall only be present when the UUID is a 16-bit
* Bluetooth UUID. Vol 2. Part G. 3.2
*/
if (included_service->attributes[0]->val_len == sizeof(uint16_t)) {
if (included_service->attributes[0]->value_len == sizeof(uint16_t)) {
memcpy(&value[len], included_service->attributes[0]->value,
included_service->attributes[0]->val_len);
len += included_service->attributes[0]->val_len;
included_service->attributes[0]->value_len);
len += included_service->attributes[0]->value_len;
}
index = get_attribute_index(service, 0);