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

diff --git a/src/storage.c b/src/storage.c
index 6bbe051..08b7249 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -66,6 +66,24 @@ void connman_storage_unregister(struct connman_storage *storage)
 	storage_list = g_slist_remove(storage_list, storage);
 }
 
+int __connman_storage_init_device(void)
+{
+	GSList *list;
+
+	DBG("");
+
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
+
+		if (storage->device_init) {
+			if (storage->device_init() == 0)
+				return 0;
+		}
+	}
+
+	return -ENOENT;
+}
+
 int __connman_storage_load_device(struct connman_device *device)
 {
 	GSList *list;
@@ -102,6 +120,24 @@ int __connman_storage_save_device(struct connman_device *device)
 	return -ENOENT;
 }
 
+int __connman_storage_init_network(struct connman_device *device)
+{
+	GSList *list;
+
+	DBG("device %p", device);
+
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
+
+		if (storage->network_init) {
+			if (storage->network_init(device) == 0)
+				return 0;
+		}
+	}
+
+	return -ENOENT;
+}
+
 int __connman_storage_load_network(struct connman_network *network)
 {
 	GSList *list;
@@ -138,179 +174,57 @@ int __connman_storage_save_network(struct connman_network *network)
 	return -ENOENT;
 }
 
-int __connman_storage_init(void)
-{
-	DBG("");
-
-	return 0;
-}
-
-void __connman_storage_cleanup(void)
+int __connman_storage_init_service(void)
 {
 	DBG("");
-}
-
-static int do_load(GKeyFile *keyfile, struct connman_element *element)
-{
-	const gchar *value;
-
-	DBG("element %p name %s", element, element->name);
-
-	value = g_key_file_get_string(keyfile, element->path,
-						"Policy", NULL);
-	if (value != NULL)
-		element->policy = __connman_element_string2policy(value);
 
-	if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK)
-		element->remember = g_key_file_get_boolean(keyfile,
-					element->path, "Remember", NULL);
-
-	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);
-
-	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);
-
-	return 0;
+	return -ENOENT;
 }
 
-int __connman_element_load(struct connman_element *element)
+int __connman_storage_load_service(struct connman_service *service)
 {
-	GKeyFile *keyfile;
-	gchar *pathname, *data = NULL;
-	gsize length;
-
-	DBG("element %p name %s", element, element->name);
-
-	pathname = g_strdup_printf("%s/elements.conf", STORAGEDIR);
-	if (pathname == NULL)
-		return -ENOMEM;
-
-	keyfile = g_key_file_new();
+	GSList *list;
 
-	if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) {
-		g_free(pathname);
-		return -ENOENT;
-	}
+	DBG("service %p", service);
 
-	g_free(pathname);
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-	if (g_key_file_load_from_data(keyfile, data, length,
-							0, NULL) == FALSE) {
-		g_free(data);
-		return -EILSEQ;
+		if (storage->service_load) {
+			if (storage->service_load(service) == 0)
+				return 0;
+		}
 	}
 
-	g_free(data);
-
-	do_load(keyfile, element);
-
-	g_key_file_free(keyfile);
-
-	return 0;
+	return -ENOENT;
 }
 
-static void do_update(GKeyFile *keyfile, struct connman_element *element)
+int __connman_storage_save_service(struct connman_service *service)
 {
 	GSList *list;
-	char *value;
-	const char *str;
 
-	DBG("element %p name %s", element, element->name);
+	DBG("service %p", service);
 
-	g_key_file_set_string(keyfile, element->path, "Name", element->name);
-
-	str = __connman_element_policy2string(element->policy);
-	if (str != NULL)
-		g_key_file_set_string(keyfile, element->path, "Policy", str);
-
-	//g_key_file_set_boolean(keyfile, element->path, "Enabled",
-	//						element->enabled);
-
-	if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK)
-		g_key_file_set_boolean(keyfile, element->path, "Remember",
-							element->remember);
-
-	__connman_element_lock(element);
-
-	for (list = element->properties; list; list = list->next) {
-		struct connman_property *property = list->data;
-
-		if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
-			continue;
-
-		if (property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE)
-			continue;
+	for (list = storage_list; list; list = list->next) {
+		struct connman_storage *storage = list->data;
 
-		if (property->type == DBUS_TYPE_STRING)
-			g_key_file_set_string(keyfile, element->path,
-					property->name, property->value);
+		if (storage->service_save) {
+			if (storage->service_save(service) == 0)
+				return 0;
+		}
 	}
 
-	__connman_element_unlock(element);
-
-	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 (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(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;
-
-	if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_FAKE)
-		return -EINVAL;
-
-	pathname = g_strdup_printf("%s/elements.conf", STORAGEDIR);
-	if (pathname == NULL)
-		return -ENOMEM;
-
-	keyfile = g_key_file_new();
-
-	if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE)
-		goto update;
-
-	if (length > 0) {
-		if (g_key_file_load_from_data(keyfile, data, length,
-							0, NULL) == FALSE)
-			goto done;
-	}
-
-	g_free(data);
-
-update:
-	do_update(keyfile, element);
-
-	data = g_key_file_to_data(keyfile, &length, NULL);
-
-	g_file_set_contents(pathname, data, length, NULL);
-
-done:
-	g_free(data);
-
-	g_key_file_free(keyfile);
-
-	g_free(pathname);
+	DBG("");
 
 	return 0;
 }
+
+void __connman_storage_cleanup(void)
+{
+	DBG("");
+}