return keyfile;
}
-void __connman_storage_save_config(GKeyFile *keyfile, const char *ident)
-{
- gchar *pathname;
-
- pathname = g_strdup_printf("%s/%s.config", STORAGEDIR, ident);
- if(pathname == NULL)
- return;
-
- storage_save(keyfile, pathname);
-}
-
-void __connman_storage_delete_config(const char *ident)
-{
- gchar *pathname;
-
- pathname = g_strdup_printf("%s/%s.config", STORAGEDIR, ident);
- if(pathname == NULL)
- return;
-
- storage_delete(pathname);
-
- g_free(pathname);
-}
-
GKeyFile *__connman_storage_open_service(const char *service_id)
{
gchar *pathname;
return ret;
}
+static gboolean remove_file(const char *service_id, const char *file)
+{
+ gchar *pathname;
+ gboolean ret = FALSE;
+
+ pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, file);
+ if(pathname == NULL)
+ return FALSE;
+
+ if (g_file_test(pathname, G_FILE_TEST_EXISTS) == FALSE) {
+ ret = TRUE;
+ } else if (g_file_test(pathname, G_FILE_TEST_IS_REGULAR) == TRUE) {
+ unlink(pathname);
+ ret = TRUE;
+ }
+
+ g_free(pathname);
+ return ret;
+}
+
+static gboolean remove_dir(const char *service_id)
+{
+ gchar *pathname;
+ gboolean ret = FALSE;
+
+ pathname = g_strdup_printf("%s/%s", STORAGEDIR, service_id);
+ if(pathname == NULL)
+ return FALSE;
+
+ if (g_file_test(pathname, G_FILE_TEST_EXISTS) == FALSE) {
+ ret = TRUE;
+ } else if (g_file_test(pathname, G_FILE_TEST_IS_DIR) == TRUE) {
+ rmdir(pathname);
+ ret = TRUE;
+ }
+
+ g_free(pathname);
+ return ret;
+}
+
+gboolean __connman_storage_remove_service(const char *service_id)
+{
+ gboolean removed;
+
+ /* Remove service configuration file */
+ removed = remove_file(service_id, SETTINGS);
+ if (removed == FALSE)
+ return FALSE;
+
+ /* Remove the statistics file also */
+ removed = remove_file(service_id, "data");
+ if (removed == FALSE)
+ return FALSE;
+
+ removed = remove_dir(service_id);
+ if (removed == FALSE)
+ return FALSE;
+
+ DBG("Removed service dir %s/%s", STORAGEDIR, service_id);
+
+ return TRUE;
+}
+
GKeyFile *__connman_storage_load_provider(const char *identifier)
{
gchar *pathname;
g_key_file_set_boolean(keyfile, "global",
"OfflineMode", val);
+ /* Migrate Powered/Enable state key/value pairs from legacy
+ * settings
+ */
+
val = g_key_file_get_boolean(keyfile_def, "WiFi",
"Enable", &error);
if (error != NULL) {
g_clear_error(&error);
- val = FALSE;
+ val = g_key_file_get_boolean(keyfile_def, "device_Wireless", "Powered", &error);
+ if (error != NULL) {
+ g_clear_error(&error);
+ val = FALSE;
+ }
}
g_key_file_set_boolean(keyfile, "WiFi",
"Enable", &error);
if (error != NULL) {
g_clear_error(&error);
- val = FALSE;
+ val = g_key_file_get_boolean(keyfile_def, "device_Bluetooth", "Powered", &error);
+ if (error != NULL) {
+ g_clear_error(&error);
+ val = FALSE;
+ }
}
g_key_file_set_boolean(keyfile, "Bluetooth",
"Enable", &error);
if (error != NULL) {
g_clear_error(&error);
- val = FALSE;
+ val = g_key_file_get_boolean(keyfile_def, "device_Ethernet", "Powered", &error);
+ if (error != NULL) {
+ g_clear_error(&error);
+ val = FALSE;
+ }
}
g_key_file_set_boolean(keyfile, "Wired",
"Enable", &error);
if (error != NULL) {
g_clear_error(&error);
- val = FALSE;
+ val = g_key_file_get_boolean(keyfile_def, "device_Cellular", "Powered", &error);
+ if (error != NULL) {
+ g_clear_error(&error);
+ val = FALSE;
+ }
}
g_key_file_set_boolean(keyfile, "Cellular",
"Enable", &error);
if (error != NULL) {
g_clear_error(&error);
- val = FALSE;
+ val = g_key_file_get_boolean(keyfile_def, "device_WiMAX", "Powered", &error);
+ if (error != NULL) {
+ g_clear_error(&error);
+ val = FALSE;
+ }
}
g_key_file_set_boolean(keyfile, "WiMAX",