char *private_key_passphrase_type;
char *phase2;
char *passphrase;
- connman_bool_t from_fs;
};
struct connman_config {
static GIOChannel *inotify_channel = NULL;
static uint inotify_watch = 0;
-#define NONFS_CONFIG_NAME "internal"
+#define INTERNAL_CONFIG_PREFIX "__internal"
/* Definition of possible strings in the .config files */
#define CONFIG_KEY_NAME "Name"
if (s->ssid == NULL || service->ssid == NULL)
continue;
+ if (s->ssid_len != service->ssid_len)
+ continue;
+
if (g_strcmp0(service->type, "wifi") == 0 &&
strncmp(s->ssid, service->ssid, s->ssid_len) == 0) {
return TRUE;
const char *ident;
char *str, *hex_ssid;
gboolean service_created = FALSE;
+ int err;
/* Strip off "service_" prefix */
ident = group + 8;
ssid = g_try_malloc0(hex_ssid_len / 2);
if (ssid == NULL) {
+ err = -ENOMEM;
g_free(hex_ssid);
- return -ENOMEM;
+ goto err;
}
for (i = 0; i < hex_ssid_len; i += 2) {
ssid_len = strlen(service->name);
ssid = g_try_malloc0(ssid_len);
- if (ssid == NULL)
- return -ENOMEM;
+ if (ssid == NULL) {
+ err = -ENOMEM;
+ goto err;
+ }
memcpy(ssid, service->name, ssid_len);
g_free(service->ssid);
if (is_protected_service(service) == TRUE) {
connman_error("Trying to provision a protected service");
-
- g_free(service->ident);
- g_free(service->type);
- g_free(service->name);
- g_free(service->ssid);
- g_free(service);
-
- return -EACCES;
+ err = -EACCES;
+ goto err;
}
str = g_key_file_get_string(keyfile, group, SERVICE_KEY_EAP, NULL);
service->passphrase = str;
}
- if (g_strcmp0(config->ident, NONFS_CONFIG_NAME) != 0)
- service->from_fs = TRUE;
- else
- service->from_fs = FALSE;
-
if (service_created)
g_hash_table_insert(config->service_table, service->ident,
service);
connman_info("Adding service configuration %s", service->ident);
return 0;
+
+err:
+ if (service_created == TRUE) {
+ g_free(service->ident);
+ g_free(service->type);
+ g_free(service->name);
+ g_free(service->ssid);
+ g_free(service);
+ }
+
+ return err;
}
static int load_config(struct connman_config *config)
{
GKeyFile *keyfile;
+ GError *error = NULL;
gsize length;
char **groups;
char *str;
}
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);
return config;
}
-int __connman_config_load_service(GKeyFile *keyfile, const char *group)
+int __connman_config_load_service(GKeyFile *keyfile, const char *group,
+ connman_bool_t persistent)
{
- struct connman_config *config = g_hash_table_lookup(config_table,
- NONFS_CONFIG_NAME);
+ struct connman_config *config;
+ const char *service_name;
+ char *ident, *filename = NULL, *content = NULL;
+ gsize content_length;
+ int err;
+
+ 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(NONFS_CONFIG_NAME);
- if (config == NULL)
- return -ENOMEM;
+ 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;
}
- return load_service(keyfile, group, config);
+ 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;
+
+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)
if (ident == NULL)
continue;
- if (g_str_equal(ident, NONFS_CONFIG_NAME) == TRUE)
- continue;
-
str = g_string_new_len(file, ident - file);
if (str == NULL)
continue;
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 (g_str_equal(ident, NONFS_CONFIG_NAME) == TRUE)
- continue;
-
- 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 (memcmp(config->ssid, ssid, ssid_len) != 0)
return;
- /* do not provision immutable services with non-fs originated configs */
- if (config->from_fs == FALSE &&
- __connman_service_get_immutable(service) == TRUE)
- return;
-
- /* only lock services with a config originated from the filesystem */
- if (config->from_fs == TRUE)
- __connman_service_set_immutable(service, TRUE);
+ __connman_service_set_immutable(service, TRUE);
__connman_service_set_favorite(service, TRUE);
projects / framework / connectivity / connman.git / blobdiff