diff options
| author | Paulo Alcantara <paulo.alcantara@openbossa.org> | 2012-07-27 16:43:23 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-07-29 20:09:43 +0200 |
| commit | 5f5386d0f577a6d4e389aaabfbddee6b764f3f57 (patch) | |
| tree | 7b6442b9abf3baeb8003dfcb477a5675fd94c2bb /src/storage.c | |
| parent | c250ef61824ce9a6b92e0ee608075f667d2f1a24 (diff) | |
| download | bluez-5f5386d0f577a6d4e389aaabfbddee6b764f3f57.tar.gz | |
storage: Store address type in "sdp" file
Diffstat (limited to 'src/storage.c')
| -rw-r--r-- | src/storage.c | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/src/storage.c b/src/storage.c index 9e0ea126b..c50e920a7 100644 --- a/src/storage.c +++ b/src/storage.c @@ -894,9 +894,10 @@ int delete_entry(bdaddr_t *src, const char *storage, bdaddr_t *dst, return err; } -int store_record(const gchar *src, const gchar *dst, sdp_record_t *rec) +int store_record(const gchar *src, const gchar *dst, uint8_t dst_type, + sdp_record_t *rec) { - char filename[PATH_MAX + 1], key[28]; + char filename[PATH_MAX + 1], key[30]; sdp_buf_t buf; int err, size, i; char *str; @@ -905,7 +906,8 @@ int store_record(const gchar *src, const gchar *dst, sdp_record_t *rec) create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - snprintf(key, sizeof(key), "%17s#%08X", dst, rec->handle); + snprintf(key, sizeof(key), "%17s#%hhu#%08X", dst, dst_type, + rec->handle); if (sdp_gen_record_pdu(rec, &buf) < 0) return -1; @@ -949,34 +951,54 @@ sdp_record_t *record_from_string(const gchar *str) sdp_record_t *fetch_record(const gchar *src, const gchar *dst, - const uint32_t handle) + uint8_t dst_type, const uint32_t handle) { - char filename[PATH_MAX + 1], key[28], *str; + char filename[PATH_MAX + 1], old_key[28], key[30], *str; sdp_record_t *rec; create_name(filename, PATH_MAX, STORAGEDIR, src, "sdp"); - snprintf(key, sizeof(key), "%17s#%08X", dst, handle); + snprintf(key, sizeof(key), "%17s#%hhu#%08X", dst, dst_type, handle); + snprintf(old_key, sizeof(old_key), "%17s#%08X", dst, handle); str = textfile_get(filename, key); - if (!str) + if (str != NULL) + goto done; + + /* Try old format (address#handle) */ + str = textfile_get(filename, old_key); + if (str == NULL) return NULL; +done: rec = record_from_string(str); free(str); return rec; } -int delete_record(const gchar *src, const gchar *dst, const uint32_t handle) +int delete_record(const gchar *src, const gchar *dst, uint8_t dst_type, + const uint32_t handle) { - char filename[PATH_MAX + 1], key[28]; + char filename[PATH_MAX + 1], old_key[28], key[30]; + int err, ret; create_name(filename, PATH_MAX, STORAGEDIR, src, "sdp"); - snprintf(key, sizeof(key), "%17s#%08X", dst, handle); + snprintf(key, sizeof(key), "%17s#%hhu#%08X", dst, dst_type, handle); + snprintf(old_key, sizeof(old_key), "%17s#%08X", dst, handle); - return textfile_del(filename, key); + err = 0; + ret = textfile_del(filename, key); + if (ret) + err = ret; + + /* Try old format (address#handle) */ + ret = textfile_del(filename, old_key); + if (ret) + err = ret; + + return err; } struct record_list { @@ -999,7 +1021,8 @@ static void create_stored_records_from_keys(char *key, char *value, rec_list->recs = sdp_list_append(rec_list->recs, rec); } -void delete_all_records(const bdaddr_t *src, const bdaddr_t *dst) +void delete_all_records(const bdaddr_t *src, const bdaddr_t *dst, + uint8_t dst_type) { sdp_list_t *records, *seq; char srcaddr[18], dstaddr[18]; @@ -1011,7 +1034,7 @@ void delete_all_records(const bdaddr_t *src, const bdaddr_t *dst) for (seq = records; seq; seq = seq->next) { sdp_record_t *rec = seq->data; - delete_record(srcaddr, dstaddr, rec->handle); + delete_record(srcaddr, dstaddr, dst_type, rec->handle); } if (records) |