*
* Connection Manager
*
- * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 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
#include <config.h>
#endif
+#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <sys/stat.h>
GKeyFile *keyfile = NULL;
GError *error = NULL;
- DBG("Loading %s", pathname);
-
keyfile = g_key_file_new();
if (!g_key_file_load_from_file(keyfile, pathname, 0, &error)) {
ret = -EIO;
}
+#if defined TIZEN_EXT
+ {
+ FILE *fp = NULL;
+ fp = fopen(pathname, "a+");
+ if(fp){
+ fflush(fp);
+ fsync(fp->_fileno);
+ fclose(fp);
+ DBG("sync the file to disk");
+ }
+ }
+#endif
+
g_free(data);
return ret;
connman_error("Failed to remove %s", pathname);
}
-GKeyFile *__connman_storage_load_global()
+GKeyFile *__connman_storage_load_global(void)
{
gchar *pathname;
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
int ret;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return -ENOMEM;
ret = storage_save(keyfile, pathname);
return ret;
}
-void __connman_storage_delete_global()
+void __connman_storage_delete_global(void)
{
gchar *pathname;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return;
storage_delete(pathname);
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s.config", STORAGEDIR, ident);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
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)
+GKeyFile *__connman_storage_load_provider_config(const char *ident)
{
gchar *pathname;
+ GKeyFile *keyfile = NULL;
- pathname = g_strdup_printf("%s/%s.config", STORAGEDIR, ident);
- if(pathname == NULL)
- return;
+ pathname = g_strdup_printf("%s/%s.config", VPN_STORAGEDIR, ident);
+ if (!pathname)
+ return NULL;
- storage_delete(pathname);
+ keyfile = storage_load(pathname);
g_free(pathname);
+
+ return keyfile;
}
GKeyFile *__connman_storage_open_service(const char *service_id)
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
return keyfile;
}
-gchar **connman_storage_get_services()
+gchar **connman_storage_get_services(void)
{
struct dirent *d;
gchar *str;
int ret;
dir = opendir(STORAGEDIR);
- if (dir == NULL)
+ if (!dir)
return NULL;
result = g_string_new(NULL);
switch (d->d_type) {
case DT_DIR:
+ case DT_UNKNOWN:
/*
* If the settings file is not found, then
* assume this directory is not a services dir.
closedir(dir);
str = g_string_free(result, FALSE);
- if (str) {
+ if (str && str[0] != '\0') {
+ /*
+ * Remove the trailing separator so that services doesn't end up
+ * with an empty element.
+ */
str[strlen(str) - 1] = '\0';
services = g_strsplit(str, "/", -1);
}
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
g_free(pathname);
- if (keyfile)
- return keyfile;
-
- pathname = g_strdup_printf("%s/%s", STORAGEDIR, DEFAULT);
- if(pathname == NULL)
- return NULL;
-
- keyfile = storage_load(pathname);
-
- g_free(pathname);
return keyfile;
}
gchar *pathname, *dirname;
dirname = g_strdup_printf("%s/%s", STORAGEDIR, service_id);
- if(dirname == NULL)
+ if (!dirname)
return -ENOMEM;
/* If the dir doesn't exist, create it */
if (!g_file_test(dirname, G_FILE_TEST_IS_DIR)) {
- if(mkdir(dirname, MODE) < 0) {
+ if (mkdir(dirname, MODE) < 0) {
if (errno != EEXIST) {
g_free(dirname);
return -errno;
return ret;
}
+static bool remove_file(const char *service_id, const char *file)
+{
+ gchar *pathname;
+ bool ret = false;
+
+ pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, file);
+ if (!pathname)
+ return false;
+
+ if (!g_file_test(pathname, G_FILE_TEST_EXISTS)) {
+ ret = true;
+ } else if (g_file_test(pathname, G_FILE_TEST_IS_REGULAR)) {
+ unlink(pathname);
+ ret = true;
+ }
+
+ g_free(pathname);
+ return ret;
+}
+
+static bool remove_dir(const char *service_id)
+{
+ gchar *pathname;
+ bool ret = false;
+
+ pathname = g_strdup_printf("%s/%s", STORAGEDIR, service_id);
+ if (!pathname)
+ return false;
+
+ if (!g_file_test(pathname, G_FILE_TEST_EXISTS)) {
+ ret = true;
+ } else if (g_file_test(pathname, G_FILE_TEST_IS_DIR)) {
+ rmdir(pathname);
+ ret = true;
+ }
+
+ g_free(pathname);
+ return ret;
+}
+
+bool __connman_storage_remove_service(const char *service_id)
+{
+ bool removed;
+
+ /* Remove service configuration file */
+ removed = remove_file(service_id, SETTINGS);
+ if (!removed)
+ return false;
+
+ /* Remove the statistics file also */
+ removed = remove_file(service_id, "data");
+ if (!removed)
+ return false;
+
+ removed = remove_dir(service_id);
+ if (!removed)
+ return false;
+
+ DBG("Removed service dir %s/%s", STORAGEDIR, service_id);
+
+ return true;
+}
+
GKeyFile *__connman_storage_load_provider(const char *identifier)
{
gchar *pathname;
pathname = g_strdup_printf("%s/%s_%s/%s", STORAGEDIR, "provider",
identifier, SETTINGS);
- if (pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
dirname = g_strdup_printf("%s/%s_%s", STORAGEDIR,
"provider", identifier);
- if (dirname == NULL)
+ if (!dirname)
return;
- if (g_file_test(dirname, G_FILE_TEST_IS_DIR) == FALSE &&
+ if (!g_file_test(dirname, G_FILE_TEST_IS_DIR) &&
mkdir(dirname, MODE) < 0) {
g_free(dirname);
return;
g_free(pathname);
}
+static bool remove_all(const char *id)
+{
+ bool removed;
+
+ remove_file(id, SETTINGS);
+ remove_file(id, "data");
+
+ removed = remove_dir(id);
+ if (!removed)
+ return false;
+
+ return true;
+}
+
+bool __connman_storage_remove_provider(const char *identifier)
+{
+ bool removed;
+ gchar *id;
+
+ id = g_strdup_printf("%s_%s", "provider", identifier);
+ if (!id)
+ return false;
+
+ if (remove_all(id))
+ DBG("Removed provider dir %s/%s", STORAGEDIR, id);
+
+ g_free(id);
+
+ id = g_strdup_printf("%s_%s", "vpn", identifier);
+ if (!id)
+ return false;
+
+ if ((removed = remove_all(id)))
+ DBG("Removed vpn dir %s/%s", STORAGEDIR, id);
+
+ g_free(id);
+
+ return removed;
+}
+
gchar **__connman_storage_get_providers(void)
{
GSList *list = NULL;
GSList *iter;
dir = opendir(STORAGEDIR);
- if (dir == NULL)
+ if (!dir)
return NULL;
while ((d = readdir(dir))) {
closedir(dir);
providers = g_try_new0(char *, num + 1);
- for (iter = list; iter != NULL; iter = g_slist_next(iter)) {
- if (providers != NULL)
+ for (iter = list; iter; iter = g_slist_next(iter)) {
+ if (providers)
providers[i] = iter->data;
else
g_free(iter->data);
return providers;
}
-
-/*
- * This function migrates keys from default.profile to settings file.
- * This can be removed once the migration is over.
-*/
-void __connman_storage_migrate()
-{
- gchar *pathname;
- GKeyFile *keyfile_def = NULL;
- GKeyFile *keyfile = NULL;
- GError *error = NULL;
- connman_bool_t val;
-
- /* If setting file exists, migration has been done. */
- keyfile = __connman_storage_load_global();
- if (keyfile) {
- g_key_file_free(keyfile);
- return;
- }
-
- pathname = g_strdup_printf("%s/%s", STORAGEDIR, DEFAULT);
- if(pathname == NULL)
- return;
-
- /* If default.profile exists, create new settings file */
- keyfile_def = storage_load(pathname);
- if (keyfile_def == NULL)
- goto done;
-
- /* Copy global settings from default.profile to settings. */
- keyfile = g_key_file_new();
-
- val = g_key_file_get_boolean(keyfile_def, "global",
- "OfflineMode", &error);
- if (error != NULL) {
- g_clear_error(&error);
- val = FALSE;
- }
-
- g_key_file_set_boolean(keyfile, "global",
- "OfflineMode", val);
-
- val = g_key_file_get_boolean(keyfile_def, "WiFi",
- "Enable", &error);
- if (error != NULL) {
- g_clear_error(&error);
- val = FALSE;
- }
-
- g_key_file_set_boolean(keyfile, "WiFi",
- "Enable", val);
-
- val = g_key_file_get_boolean(keyfile_def, "Bluetooth",
- "Enable", &error);
- if (error != NULL) {
- g_clear_error(&error);
- val = FALSE;
- }
-
- g_key_file_set_boolean(keyfile, "Bluetooth",
- "Enable", val);
-
- val = g_key_file_get_boolean(keyfile_def, "Wired",
- "Enable", &error);
- if (error != NULL) {
- g_clear_error(&error);
- val = FALSE;
- }
-
- g_key_file_set_boolean(keyfile, "Wired",
- "Enable", val);
-
- val = g_key_file_get_boolean(keyfile_def, "Cellular",
- "Enable", &error);
- if (error != NULL) {
- g_clear_error(&error);
- val = FALSE;
- }
-
- g_key_file_set_boolean(keyfile, "Cellular",
- "Enable", val);
-
- val = g_key_file_get_boolean(keyfile_def, "WiMAX",
- "Enable", &error);
- if (error != NULL) {
- g_clear_error(&error);
- val = FALSE;
- }
-
- g_key_file_set_boolean(keyfile, "WiMAX",
- "Enable", val);
-
- __connman_storage_save_global(keyfile);
-
- g_key_file_free(keyfile);
-
- g_key_file_free(keyfile_def);
-
-done:
- g_free(pathname);
-}
projects / platform / upstream / connman.git / blobdiff