Add support for loading previously stored services

This adds support for loading the GATT primary services information
that may exist. This will allow registering the DBus interface of a
service without connecting to the remote device.

3 files changed, 85 insertions, 0 deletions

diff --git a/attrib/client.c b/attrib/client.c
index d984122d..ca2429ea 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <glib.h>
 
 #include <bluetooth/bluetooth.h>
@@ -33,6 +34,7 @@
 #include <bluetooth/sdp_lib.h>
 
 #include "log.h"
+#include "glib-helper.h"
 #include "gdbus.h"
 #include "btio.h"
 #include "storage.h"
@@ -261,6 +263,42 @@ static char *primary_list_to_string(GSList *primary_list)
 	return g_string_free(services, FALSE);
 }
 
+static GSList *string_to_primary_list(const char *str)
+{
+	GSList *l = NULL;
+	char **services;
+	int i;
+
+	if (str == NULL)
+		return NULL;
+
+	services = g_strsplit(str, " ", 0);
+	if (services == NULL)
+		return NULL;
+
+	for (i = 0; services[i]; i++) {
+		struct primary *prim;
+		char uuidstr[MAX_LEN_UUID_STR + 1];
+		int ret;
+
+		prim = g_new0(struct primary, 1);
+		prim->uuid = g_new0(uuid_t, 1);
+
+		ret = sscanf(services[i], "%hd#%hd#%s", &prim->start,
+					&prim->end, (char *) &uuidstr);
+		if (ret < 3)
+			continue;
+
+		bt_string2uuid(prim->uuid, uuidstr);
+
+		l = g_slist_append(l, prim);
+	}
+
+	g_strfreev(services);
+
+	return l;
+}
+
 static void store_primary_services(struct gatt_service *gatt)
 {
        char *services;
@@ -272,6 +310,34 @@ static void store_primary_services(struct gatt_service *gatt)
        g_free(services);
 }
 
+static gboolean load_primary_services(struct gatt_service *gatt)
+{
+	GSList *primary_list;
+	char *str;
+
+	if (gatt->primary) {
+		DBG("Services already loaded");
+		return FALSE;
+	}
+
+	str = read_device_services(&gatt->sba, &gatt->dba);
+	if (str == NULL)
+		return FALSE;
+
+	primary_list = string_to_primary_list(str);
+
+	free(str);
+
+	if (primary_list == NULL)
+		return FALSE;
+
+	gatt->primary = primary_list;
+
+	/* FIXME: register interfaces here */
+
+	return TRUE;
+}
+
 static void primary_cb(guint8 status, const guint8 *pdu, guint16 plen,
 							gpointer user_data)
 {
@@ -411,6 +477,11 @@ int attrib_client_register(bdaddr_t *sba, bdaddr_t *dba, const char *path,
 	bacpy(&gatt->dba, dba);
 	gatt->psm = psm;
 
+	if (load_primary_services(gatt)) {
+		DBG("Primary services loaded");
+		return 0;
+	}
+
 	if (psm < 0) {
 		/*
 		 * FIXME: when PSM is not given means that L2CAP fixed
diff --git a/src/storage.c b/src/storage.c
index f07f6d78..4d4607a6 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -1251,3 +1251,16 @@ int write_device_services(const bdaddr_t *sba, const bdaddr_t *dba,
 
        return textfile_put(filename, addr, services);
 }
+
+char *read_device_services(const bdaddr_t *sba, const bdaddr_t *dba)
+{
+       char filename[PATH_MAX + 1], addr[18];
+
+       create_filename(filename, PATH_MAX, sba, "primary");
+
+       create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+       ba2str(dba, addr);
+
+       return textfile_caseget(filename, addr);
+}
diff --git a/src/storage.h b/src/storage.h
index 99270c5b..93903a7c 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -80,6 +80,7 @@ int write_blocked(const bdaddr_t *local, const bdaddr_t *remote,
 							gboolean blocked);
 int write_device_services(const bdaddr_t *sba, const bdaddr_t *dba,
 							const char *services);
+char *read_device_services(const bdaddr_t *sba, const bdaddr_t *dba);
 
 #define PNP_UUID		"00001200-0000-1000-8000-00805f9b34fb"