iptables: Refactoring how jumps are handled

[framework/connectivity/connman.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index a0872f7..db15228 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -373,6 +374,7 @@ err:
 static int load_config(struct connman_config *config)
 {
        GKeyFile *keyfile;
+       GError *error = NULL;
        gsize length;
        char **groups;
        char *str;
@@ -381,7 +383,7 @@ static int load_config(struct connman_config *config)
 
        DBG("config %p", config);
 
-       keyfile = __connman_storage_open_config(config->ident);
+       keyfile = __connman_storage_load_config(config->ident);
        if (keyfile == NULL)
                return -EIO;
 
@@ -401,8 +403,11 @@ static int load_config(struct connman_config *config)
        }
 
        protected = g_key_file_get_boolean(keyfile, "global",
-                                       CONFIG_KEY_PROT, NULL);
-       config->protected = protected;
+                                       CONFIG_KEY_PROT, &error);
+       if (error == NULL)
+               config->protected = protected;
+       else
+               config->protected = TRUE;
 
        groups = g_key_file_get_groups(keyfile, &length);
 
@@ -413,7 +418,7 @@ static int load_config(struct connman_config *config)
 
        g_strfreev(groups);
 
-       __connman_storage_close_config(config->ident, keyfile, FALSE);
+       g_key_file_free(keyfile);
 
        return 0;
 }
@@ -448,7 +453,7 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group,
 {
        struct connman_config *config;
        const char *service_name;
-       char *ident, *filename = NULL, *content = NULL;
+       char *ident, *content = NULL;
        gsize content_length;
        int err;
 
@@ -478,6 +483,7 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group,
                                                        service_name);
        g_key_file_set_string(keyfile, "global", CONFIG_KEY_DESC,
                                                "Internal Config File");
+       g_key_file_set_boolean(keyfile, "global", CONFIG_KEY_PROT, FALSE);
 
        content = g_key_file_to_data(keyfile, &content_length, NULL);
        if (content == NULL) {
@@ -485,30 +491,33 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group,
                goto out;
        }
 
-       filename = g_strdup_printf("%s/%s.config", STORAGEDIR, ident);
-       if (filename == NULL) {
-               err = -ENOMEM;
-               goto out;
-       }
+       DBG("Saving %zu bytes to %s", content_length, service_name);
 
-       DBG("Saving %d bytes to %s", content_length, filename);
-
-       if (g_file_set_contents(filename, content,
-                               content_length, NULL) == FALSE) {
-               err = -EIO;
-               goto out;
-       }
+       __connman_storage_save_config(keyfile, ident);
 
        return 0;
 
 out:
        g_free(ident);
        g_free(content);
-       g_free(filename);
 
        return err;
 }
 
+static connman_bool_t validate_ident(const char *ident)
+{
+       unsigned int i;
+
+       if (ident == NULL)
+               return FALSE;
+
+       for (i = 0; i < strlen(ident); i++)
+               if (g_ascii_isprint(ident[i]) == FALSE)
+                       return FALSE;
+
+       return TRUE;
+}
+
 static int read_configs(void)
 {
        GDir *dir;
@@ -536,12 +545,14 @@ static int read_configs(void)
 
                        ident = g_string_free(str, FALSE);
 
-                       if (connman_dbus_validate_ident(ident) == TRUE) {
+                       if (validate_ident(ident) == TRUE) {
                                struct connman_config *config;
 
                                config = create_config(ident);
                                if (config != NULL)
                                        load_config(config);
+                       } else {
+                               connman_error("Invalid config ident %s", ident);
                        }
                        g_free(ident);
                }
@@ -614,8 +625,10 @@ static gboolean inotify_data(GIOChannel *channel, GIOCondition cond,
 
                *ext = '\0';
 
-               if (connman_dbus_validate_ident(ident) == FALSE)
+               if (validate_ident(ident) == FALSE) {
+                       connman_error("Invalid config ident %s", ident);
                        continue;
+               }
 
                if (event->mask & IN_CREATE)
                        create_config(ident);
@@ -627,6 +640,7 @@ static gboolean inotify_data(GIOChannel *channel, GIOCondition cond,
                        if (config != NULL) {
                                g_hash_table_remove_all(config->service_table);
                                load_config(config);
+                               __connman_service_provision_changed(ident);
                        }
                }
 
@@ -846,3 +860,24 @@ int __connman_config_provision_service(struct connman_service *service)
 
        return 0;
 }
+
+int __connman_config_provision_service_ident(struct connman_service *service,
+                                                       const char *ident)
+{
+       enum connman_service_type type;
+       struct connman_config *config;
+
+       DBG("service %p", service);
+
+       /* For now only WiFi services are supported */
+       type = connman_service_get_type(service);
+       if (type != CONNMAN_SERVICE_TYPE_WIFI)
+               return -ENOSYS;
+
+       config = g_hash_table_lookup(config_table, ident);
+       if(config != NULL)
+               g_hash_table_foreach(config->service_table,
+                                               provision_service, service);
+
+       return 0;
+}