X-Git-Url: http://git.maemo.org/git/?p=connman;a=blobdiff_plain;f=src%2Fstorage.c;h=08b7249cedb9f5a7beda41d032ae3cd0954f5d92;hp=e0e3dc55733c94466afb3c7c159f3831f6c89696;hb=050811a6aa9fcfe1885e90694eeeebc2ee0fd071;hpb=0dbb44988061fa97f85bb56e5b745df9fe888cba

diff --git a/src/storage.c b/src/storage.c
index e0e3dc5..08b7249 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -25,180 +25,206 @@
 
 #include "connman.h"
 
-int __connman_storage_init(void)
+static GSList *storage_list = NULL;
+
+static gint compare_priority(gconstpointer a, gconstpointer b)
 {
-	DBG("");
+	const struct connman_storage *storage1 = a;
+	const struct connman_storage *storage2 = b;
 
-	return 0;
+	return storage2->priority - storage1->priority;
 }
 
-void __connman_storage_cleanup(void)
+/**
+ * connman_storage_register:
+ * @storage: storage module
+ *
+ * Register a new storage module
+ *
+ * Returns: %0 on success
+ */
+int connman_storage_register(struct connman_storage *storage)
 {
-	DBG("");
+	DBG("storage %p name %s", storage, storage->name);
+
+	storage_list = g_slist_insert_sorted(storage_list, storage,
+							compare_priority);
+
+	return 0;
 }
 
-static int do_load(GKeyFile *keyfile, struct connman_element *element)
+/**
+ * connman_storage_unregister:
+ * @storage: storage module
+ *
+ * Remove a previously registered storage module
+ */
+void connman_storage_unregister(struct connman_storage *storage)
 {
-	const gchar *value;
+	DBG("storage %p name %s", storage, storage->name);
 
-	DBG("element %p name %s", element, element->name);
+	storage_list = g_slist_remove(storage_list, storage);
+}
 
-	value = g_key_file_get_string(keyfile, element->path,
-						"Policy", NULL);
-	if (value != NULL)
-		element->policy = __connman_element_string2policy(value);
+int __connman_storage_init_device(void)
+{
+	GSList *list;
 
-	if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK)
-		element->remember = g_key_file_get_boolean(keyfile,
-					element->path, "Remember", NULL);
+	DBG("");
 
-	value = g_key_file_get_string(keyfile, element->path,
-						"WiFi.Security", NULL);
-	if (value != NULL)
-		connman_element_set_property(element,
-				CONNMAN_PROPERTY_ID_WIFI_SECURITY, &value);
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	value = g_key_file_get_string(keyfile, element->path,
-						"WiFi.Passphrase", NULL);
-	if (value != NULL)
-		connman_element_set_property(element,
-				CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &value);
+		if (storage->device_init) {
+			if (storage->device_init() == 0)
+				return 0;
+		}
+	}
 
-	return 0;
+	return -ENOENT;
 }
 
-int __connman_element_load(struct connman_element *element)
+int __connman_storage_load_device(struct connman_device *device)
 {
-	GKeyFile *keyfile;
-	gchar *pathname, *data = NULL;
-	gsize length;
-
-	DBG("element %p name %s", element, element->name);
+	GSList *list;
 
-	pathname = g_strdup_printf("%s/elements.conf", STORAGEDIR);
-	if (pathname == NULL)
-		return -ENOMEM;
+	DBG("device %p", device);
 
-	keyfile = g_key_file_new();
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) {
-		g_free(pathname);
-		return -ENOENT;
+		if (storage->device_load) {
+			if (storage->device_load(device) == 0)
+				return 0;
+		}
 	}
 
-	g_free(pathname);
+	return -ENOENT;
+}
 
-	if (g_key_file_load_from_data(keyfile, data, length,
-							0, NULL) == FALSE) {
-		g_free(data);
-		return -EILSEQ;
-	}
+int __connman_storage_save_device(struct connman_device *device)
+{
+	GSList *list;
 
-	g_free(data);
+	DBG("device %p", device);
 
-	do_load(keyfile, element);
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	g_key_file_free(keyfile);
+		if (storage->device_save) {
+			if (storage->device_save(device) == 0)
+				return 0;
+		}
+	}
 
-	return 0;
+	return -ENOENT;
 }
 
-static void do_update(GKeyFile *keyfile, struct connman_element *element)
+int __connman_storage_init_network(struct connman_device *device)
 {
 	GSList *list;
-	char *value;
-	const char *str;
 
-	DBG("element %p name %s", element, element->name);
+	DBG("device %p", device);
+
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	g_key_file_set_string(keyfile, element->path, "Name", element->name);
+		if (storage->network_init) {
+			if (storage->network_init(device) == 0)
+				return 0;
+		}
+	}
 
-	str = __connman_element_policy2string(element->policy);
-	if (str != NULL)
-		g_key_file_set_string(keyfile, element->path, "Policy", str);
+	return -ENOENT;
+}
 
-	//g_key_file_set_boolean(keyfile, element->path, "Enabled",
-	//						element->enabled);
+int __connman_storage_load_network(struct connman_network *network)
+{
+	GSList *list;
 
-	if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK)
-		g_key_file_set_boolean(keyfile, element->path, "Remember",
-							element->remember);
+	DBG("network %p", network);
 
-	__connman_element_lock(element);
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	for (list = element->properties; list; list = list->next) {
-		struct connman_property *property = list->data;
+		if (storage->network_load) {
+			if (storage->network_load(network) == 0)
+				return 0;
+		}
+	}
 
-		if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
-			continue;
+	return -ENOENT;
+}
 
-		if (property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE)
-			continue;
+int __connman_storage_save_network(struct connman_network *network)
+{
+	GSList *list;
 
-		if (property->type == DBUS_TYPE_STRING)
-			g_key_file_set_string(keyfile, element->path,
-					property->name, property->value);
-	}
+	DBG("network %p", network);
 
-	__connman_element_unlock(element);
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	if (connman_element_get_value(element,
-			CONNMAN_PROPERTY_ID_WIFI_SECURITY, &value) == 0)
-		g_key_file_set_string(keyfile, element->path,
-						"WiFi.Security", value);
+		if (storage->network_save) {
+			if (storage->network_save(network) == 0)
+				return 0;
+		}
+	}
 
-	if (connman_element_get_value(element,
-			CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &value) == 0)
-		g_key_file_set_string(keyfile, element->path,
-						"WiFi.Passphrase", value);
+	return -ENOENT;
 }
 
-int __connman_element_store(struct connman_element *element)
+int __connman_storage_init_service(void)
 {
-	GKeyFile *keyfile;
-	gchar *pathname, *data = NULL;
-	gsize length;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE &&
-				element->type != CONNMAN_ELEMENT_TYPE_NETWORK)
-		return -EINVAL;
+	DBG("");
 
-	if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_FAKE ||
-			element->subtype == CONNMAN_ELEMENT_SUBTYPE_NETWORK)
-		return -EINVAL;
+	return -ENOENT;
+}
 
-	pathname = g_strdup_printf("%s/elements.conf", STORAGEDIR);
-	if (pathname == NULL)
-		return -ENOMEM;
+int __connman_storage_load_service(struct connman_service *service)
+{
+	GSList *list;
 
-	keyfile = g_key_file_new();
+	DBG("service %p", service);
 
-	if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE)
-		goto update;
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	if (length > 0) {
-		if (g_key_file_load_from_data(keyfile, data, length,
-							0, NULL) == FALSE)
-			goto done;
+		if (storage->service_load) {
+			if (storage->service_load(service) == 0)
+				return 0;
+		}
 	}
 
-	g_free(data);
+	return -ENOENT;
+}
 
-update:
-	do_update(keyfile, element);
+int __connman_storage_save_service(struct connman_service *service)
+{
+	GSList *list;
 
-	data = g_key_file_to_data(keyfile, &length, NULL);
+	DBG("service %p", service);
 
-	g_file_set_contents(pathname, data, length, NULL);
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-done:
-	g_free(data);
+		if (storage->service_save) {
+			if (storage->service_save(service) == 0)
+				return 0;
+		}
+	}
 
-	g_key_file_free(keyfile);
+	return -ENOENT;
+}
 
-	g_free(pathname);
+int __connman_storage_init(void)
+{
+	DBG("");
 
 	return 0;
 }
+
+void __connman_storage_cleanup(void)
+{
+	DBG("");
+}