[PATCH BlueZ v2 16/16] storage: Keep backward compatibility

[Paulo Alcantara <paulo.alcantara@xxxxxxxxxxxxx>]

The "blocked" file is shared by both BR/EDR and LE devices, so we must
keep backward compatibility with the old storage format.
---
 src/storage.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/storage.c b/src/storage.c
index 33dcace..cb7cde2 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -1155,9 +1155,17 @@ gboolean read_blocked(const bdaddr_t *local, const bdaddr_t *remote,
 	sprintf(&key[17], "#%hhu", bdaddr_type);
 
 	str = textfile_caseget(filename, key);
-	if (!str)
+	if (str != NULL)
+		goto done;
+
+	/* Try old format (address only) */
+	key[17] = '\0';
+
+	str = textfile_caseget(filename, key);
+	if (str == NULL)
 		return FALSE;
 
+done:
 	free(str);
 
 	return TRUE;
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html