*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2012 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 <errno.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
}
for (i = 0; i < hex_ssid_len; i += 2) {
- sscanf(hex_ssid + i, "%02x", &hex);
+ if (sscanf(hex_ssid + i, "%02x", &hex) <= 0) {
+ connman_warn("Invalid SSID %s", hex_ssid);
+ g_free(ssid);
+ g_free(hex_ssid);
+ err = -EILSEQ;
+ goto err;
+ }
ssid[j++] = hex;
}
gsize length;
char **groups;
char *str;
- gboolean protected;
+ gboolean protected, found = FALSE;
int i;
DBG("config %p", config);
- keyfile = __connman_storage_open_config(config->ident);
+ keyfile = __connman_storage_load_config(config->ident);
if (keyfile == NULL)
return -EIO;
groups = g_key_file_get_groups(keyfile, &length);
for (i = 0; groups[i] != NULL; i++) {
- if (g_str_has_prefix(groups[i], "service_") == TRUE)
- load_service(keyfile, groups[i], config);
+ if (g_str_has_prefix(groups[i], "service_") == TRUE) {
+ if (load_service(keyfile, groups[i], config) == 0)
+ found = TRUE;
+ }
}
+ if (found == FALSE)
+ connman_warn("Config file %s/%s.config does not contain any "
+ "configuration that can be provisioned!",
+ STORAGEDIR, config->ident);
+
g_strfreev(groups);
- __connman_storage_close_config(config->ident, keyfile, FALSE);
+ g_key_file_free(keyfile);
return 0;
}
return config;
}
-int __connman_config_load_service(GKeyFile *keyfile, const char *group,
- connman_bool_t persistent)
+static connman_bool_t validate_ident(const char *ident)
{
- struct connman_config *config;
- const char *service_name;
- char *ident, *filename = NULL, *content = NULL;
- gsize content_length;
- int err;
+ unsigned int i;
- service_name = group + strlen("service_");
- ident = g_strdup_printf("%s_%s", INTERNAL_CONFIG_PREFIX, service_name);
if (ident == NULL)
- return -ENOMEM;
-
- DBG("ident %s", ident);
-
- config = g_hash_table_lookup(config_table, ident);
- if (config == NULL) {
- config = create_config(ident);
- if (config == NULL) {
- err = -ENOMEM;
- goto out;
- }
-
- config->protected = FALSE;
- }
-
- err = load_service(keyfile, group, config);
- if (persistent == FALSE || err < 0)
- goto out;
-
- g_key_file_set_string(keyfile, "global", CONFIG_KEY_NAME,
- 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) {
- err = -EIO;
- 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);
-
- if (g_file_set_contents(filename, content,
- content_length, NULL) == FALSE) {
- err = -EIO;
- goto out;
- }
-
- return 0;
+ return FALSE;
-out:
- g_free(ident);
- g_free(content);
- g_free(filename);
+ for (i = 0; i < strlen(ident); i++)
+ if (g_ascii_isprint(ident[i]) == FALSE)
+ return FALSE;
- return err;
+ return TRUE;
}
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);
}
*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);
if (config != NULL) {
g_hash_table_remove_all(config->service_table);
load_config(config);
+ __connman_service_provision_changed(ident);
}
}
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;
+}