From a6b75b038392bcf45816628e4eeb18da36e7b020 Mon Sep 17 00:00:00 2001 From: Paulo Alcantara Date: Sat, 26 May 2012 21:40:51 -0300 Subject: [PATCH] storage: Store address type in "attributes" file Addressing types can be either BR/EDR, BLE public or BLE random so the entries in the "attributes" file did not contain enough information to distinguish which addressing type it's supposed to be. Entries will now contain both address number and address type as a single key in every entry in the file. --- attrib/client.c | 6 +++++- src/storage.c | 12 ++++-------- src/storage.h | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/attrib/client.c b/attrib/client.c index 8aa280078..7aefd963e 100644 --- a/attrib/client.c +++ b/attrib/client.c @@ -635,7 +635,9 @@ static GSList *load_characteristics(struct gatt_service *gatt, uint16_t start) static void store_attribute(struct gatt_service *gatt, uint16_t handle, uint16_t type, uint8_t *value, gsize len) { + struct btd_device *device = gatt->dev; bdaddr_t sba, dba; + uint8_t bdaddr_type; bt_uuid_t uuid; char *str, *tmp; guint i; @@ -652,7 +654,9 @@ static void store_attribute(struct gatt_service *gatt, uint16_t handle, gatt_get_address(gatt, &sba, &dba, NULL); - write_device_attribute(&sba, &dba, handle, str); + bdaddr_type = device_get_addr_type(device); + + write_device_attribute(&sba, &dba, bdaddr_type, handle, str); g_free(str); } diff --git a/src/storage.c b/src/storage.c index f8e967920..cbbf8f6b9 100644 --- a/src/storage.c +++ b/src/storage.c @@ -1223,14 +1223,10 @@ int delete_device_service(const bdaddr_t *sba, const bdaddr_t *dba, create_filename(filename, PATH_MAX, sba, "characteristic"); delete_by_pattern(filename, key); - key[17] = '\0'; - /* Deleting all attributes values of a given key */ create_filename(filename, PATH_MAX, sba, "attributes"); delete_by_pattern(filename, key); - sprintf(&key[17], "#%hhu", bdaddr_type); - /* Deleting all CCC values of a given key */ create_filename(filename, PATH_MAX, sba, "ccc"); delete_by_pattern(filename, key); @@ -1283,17 +1279,17 @@ char *read_device_characteristics(const bdaddr_t *sba, const bdaddr_t *dba, } int write_device_attribute(const bdaddr_t *sba, const bdaddr_t *dba, - uint16_t handle, const char *chars) + uint8_t bdaddr_type, uint16_t handle, + const char *chars) { - char filename[PATH_MAX + 1], addr[18], key[23]; + char filename[PATH_MAX + 1], addr[18], key[25]; create_filename(filename, PATH_MAX, sba, "attributes"); create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ba2str(dba, addr); - - snprintf(key, sizeof(key), "%17s#%04X", addr, handle); + snprintf(key, sizeof(key), "%17s#%hhu#%04X", addr, bdaddr_type, handle); return textfile_put(filename, key, chars); } diff --git a/src/storage.h b/src/storage.h index 69ade355d..c541807f9 100644 --- a/src/storage.h +++ b/src/storage.h @@ -89,7 +89,8 @@ int write_device_characteristics(const bdaddr_t *sba, const bdaddr_t *dba, char *read_device_characteristics(const bdaddr_t *sba, const bdaddr_t *dba, uint8_t bdaddr_type, uint16_t handle); int write_device_attribute(const bdaddr_t *sba, const bdaddr_t *dba, - uint16_t handle, const char *chars); + uint8_t bdaddr_type, uint16_t handle, + const char *chars); int read_device_attributes(const bdaddr_t *sba, textfile_cb func, void *data); int read_device_ccc(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type, uint16_t handle, uint16_t *value); -- 2.47.3