From: "Frédéric Danis" <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v5 11/15] adapter: Move storage names to cache directory
Date: Thu, 18 Oct 2012 11:00:54 +0200 [thread overview]
Message-ID: <1350550858-12239-12-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1350550858-12239-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/event.c | 51 ++++++++++++++++++++++++---
2 files changed, 150 insertions(+), 7 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 30fda1f..ca47111 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2511,6 +2511,83 @@ void btd_adapter_unref(struct btd_adapter *adapter)
g_free(path);
}
+struct converter {
+ char *addr;
+ char *group;
+ char *key;
+};
+
+static void convert_cache(char *key, char *value, void *user_data)
+{
+ struct converter *convert = user_data;
+ char filename[PATH_MAX + 1];
+ char *str = key;
+ GKeyFile *key_file;
+ char *data;
+ gsize length = 0;
+
+ if (strchr(key, '#'))
+ str[17] = '\0';
+
+ if (bachk(str) != 0)
+ return;
+
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", convert->addr,
+ str);
+ filename[PATH_MAX] = '\0';
+ create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+ key_file = g_key_file_new();
+ g_key_file_load_from_file(key_file, filename, 0, NULL);
+ g_key_file_set_string(key_file, convert->group, convert->key, value);
+
+ data = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(filename, data, length, NULL);
+ g_free(data);
+
+ g_key_file_free(key_file);
+}
+
+static void convert_device_storage(struct btd_adapter *adapter)
+{
+ char filename[PATH_MAX + 1];
+ char address[18];
+ char *str;
+ struct converter convert;
+
+ ba2str(&adapter->bdaddr, address);
+ convert.addr = address;
+ convert.group = "General";
+
+ /* Convert device's name cache */
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/names", address);
+ filename[PATH_MAX] = '\0';
+
+ str = textfile_get(filename, "converted");
+ if (str && strcmp(str, "yes") == 0) {
+ DBG("Legacy names file already converted");
+ } else {
+ convert.key = "Name";
+ textfile_foreach(filename, convert_cache, &convert);
+ textfile_put(filename, "converted", "yes");
+ }
+ free(str);
+
+ /* Convert lastseen device cache */
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/lastseen", address);
+ filename[PATH_MAX] = '\0';
+
+ str = textfile_get(filename, "converted");
+ if (str && strcmp(str, "yes") == 0) {
+ DBG("Legacy lastseen file already converted");
+ } else {
+ convert.key = "LastSeen";
+ textfile_foreach(filename, convert_cache, &convert);
+ textfile_put(filename, "converted", "yes");
+ }
+ free(str);
+}
+
static void convert_config(struct btd_adapter *adapter, const char *filename,
GKeyFile *key_file)
{
@@ -2684,6 +2761,7 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
btd_adapter_gatt_server_start(adapter);
load_config(adapter);
+ convert_device_storage(adapter);
load_drivers(adapter);
btd_profile_foreach(probe_profile, adapter);
clear_blocked(adapter);
@@ -2965,9 +3043,31 @@ void adapter_update_found_devices(struct btd_adapter *adapter,
write_remote_appearance(&adapter->bdaddr, bdaddr, bdaddr_type,
eir_data.appearance);
- if (eir_data.name != NULL && eir_data.name_complete)
- write_device_name(&adapter->bdaddr, bdaddr, bdaddr_type,
- eir_data.name);
+ if (eir_data.name != NULL && eir_data.name_complete) {
+ char filename[PATH_MAX + 1];
+ char s_addr[18], d_addr[18];
+ GKeyFile *key_file;
+ char *data;
+ gsize length = 0;
+
+ ba2str(&adapter->bdaddr, s_addr);
+ ba2str(bdaddr, d_addr);
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s",
+ s_addr, d_addr);
+ filename[PATH_MAX] = '\0';
+ create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+ key_file = g_key_file_new();
+ g_key_file_load_from_file(key_file, filename, 0, NULL);
+ g_key_file_set_string(key_file, "General", "Name",
+ eir_data.name);
+
+ data = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(filename, data, length, NULL);
+ g_free(data);
+
+ g_key_file_free(key_file);
+ }
/* Avoid creating LE device if it's not discoverable */
if (bdaddr_type != BDADDR_BREDR &&
diff --git a/src/event.c b/src/event.c
index 48aeffd..b9eb368 100644
--- a/src/event.c
+++ b/src/event.c
@@ -34,6 +34,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
+#include <sys/stat.h>
#include <bluetooth/bluetooth.h>
@@ -224,11 +225,36 @@ static void update_lastseen(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
{
time_t t;
struct tm *tm;
+ char filename[PATH_MAX + 1];
+ char s_addr[18], d_addr[18];
+ char str[24];
+ GKeyFile *key_file;
+ char *data;
+ gsize length = 0;
t = time(NULL);
tm = gmtime(&t);
- write_lastseen_info(sba, dba, dba_type, tm);
+
+ memset(str, 0, sizeof(str));
+ strftime(str, sizeof(str), "%Y-%m-%d %H:%M:%S %Z", tm);
+
+ ba2str(sba, s_addr);
+ ba2str(dba, d_addr);
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", s_addr,
+ d_addr);
+ filename[PATH_MAX] = '\0';
+ create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+ key_file = g_key_file_new();
+ g_key_file_load_from_file(key_file, filename, 0, NULL);
+ g_key_file_set_string(key_file, "General", "LastSeen", str);
+
+ data = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(filename, data, length, NULL);
+ g_free(data);
+
+ g_key_file_free(key_file);
}
static void update_lastused(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
@@ -265,7 +291,11 @@ void btd_event_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name)
{
struct btd_adapter *adapter;
struct btd_device *device;
- uint8_t peer_type;
+ char filename[PATH_MAX + 1];
+ char local_addr[18], peer_addr[18];
+ GKeyFile *key_file;
+ char *data;
+ gsize length = 0;
if (!g_utf8_validate(name, -1, NULL)) {
int i;
@@ -282,9 +312,22 @@ void btd_event_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name)
if (!get_adapter_and_device(local, peer, &adapter, &device, FALSE))
return;
- peer_type = device_get_addr_type(device);
+ ba2str(local, local_addr);
+ ba2str(peer, peer_addr);
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local_addr,
+ peer_addr);
+ filename[PATH_MAX] = '\0';
+ create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+ key_file = g_key_file_new();
+ g_key_file_load_from_file(key_file, filename, 0, NULL);
+ g_key_file_set_string(key_file, "General", "Name", name);
+
+ data = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(filename, data, length, NULL);
+ g_free(data);
- write_device_name(local, peer, peer_type, name);
+ g_key_file_free(key_file);
if (device)
device_set_name(device, name);
--
1.7.9.5
next prev parent reply other threads:[~2012-10-18 9:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-18 9:00 [PATCH v5 00/15] Move storage config and names files to ini-file format Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 01/15] doc: Add settings storage documentation Frédéric Danis
2012-10-18 14:02 ` Daniel Wagner
2012-10-18 14:31 ` Frederic Danis
2012-10-18 9:00 ` [PATCH v5 02/15] adapter: Read name in storage at init Frédéric Danis
2012-10-18 14:04 ` Daniel Wagner
2012-10-18 14:41 ` Frederic Danis
2012-10-18 9:00 ` [PATCH v5 03/15] adaptername: Retrieve config name from adapter Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 04/15] adapter: Read device class in storage at init Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 05/15] adapter: Move pairable read to load_config() Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 06/15] adapter: Read pairable timeout in storage at init Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 07/15] adapter: Read discoverable " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 08/15] adapter: Read mode " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 09/15] adapter: Move saved config to ini-file format Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 10/15] TODO: Add entry to remove storage convertion function Frédéric Danis
2012-10-18 9:00 ` Frédéric Danis [this message]
2012-10-18 9:00 ` [PATCH v5 12/15] device: Retrieve name from cache directory Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 13/15] dbusoob: Store device name in " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 14/15] input: Retrieve device name from " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 15/15] hcitool: Retrieve names " Frédéric Danis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350550858-12239-12-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.