char *private_key_passphrase_type;
char *phase2;
char *passphrase;
+ GSList *service_identifiers;
+ char *config_ident; /* file prefix */
+ char *config_entry; /* entry name */
};
struct connman_config {
static GIOChannel *inotify_channel = NULL;
static uint inotify_watch = 0;
+static connman_bool_t cleanup = FALSE;
#define INTERNAL_CONFIG_PREFIX "__internal"
static void unregister_service(gpointer data)
{
- struct connman_config_service *service = data;
-
- connman_info("Removing service configuration %s", service->ident);
-
- protected_services = g_slist_remove(protected_services, service);
-
- g_free(service->ident);
- g_free(service->type);
- g_free(service->name);
- g_free(service->ssid);
- g_free(service->eap);
- g_free(service->identity);
- g_free(service->ca_cert_file);
- g_free(service->client_cert_file);
- g_free(service->private_key_file);
- g_free(service->private_key_passphrase);
- g_free(service->private_key_passphrase_type);
- g_free(service->phase2);
- g_free(service->passphrase);
- g_free(service);
+ struct connman_config_service *config_service = data;
+ struct connman_service *service;
+ char *service_id;
+ GSList *list;
+
+ if (cleanup == TRUE)
+ goto free_only;
+
+ connman_info("Removing service configuration %s",
+ config_service->ident);
+
+ protected_services = g_slist_remove(protected_services,
+ config_service);
+
+ for (list = config_service->service_identifiers; list != NULL;
+ list = list->next) {
+ service_id = list->data;
+
+ service = __connman_service_lookup_from_ident(service_id);
+ if (service != NULL) {
+ __connman_service_set_immutable(service, FALSE);
+ __connman_service_remove(service);
+ }
+
+ if (__connman_storage_remove_service(service_id) == FALSE)
+ DBG("Could not remove all files for service %s",
+ service_id);
+ }
+
+free_only:
+ g_free(config_service->ident);
+ g_free(config_service->type);
+ g_free(config_service->name);
+ g_free(config_service->ssid);
+ g_free(config_service->eap);
+ g_free(config_service->identity);
+ g_free(config_service->ca_cert_file);
+ g_free(config_service->client_cert_file);
+ g_free(config_service->private_key_file);
+ g_free(config_service->private_key_passphrase);
+ g_free(config_service->private_key_passphrase_type);
+ g_free(config_service->phase2);
+ g_free(config_service->passphrase);
+ g_slist_free_full(config_service->service_identifiers, g_free);
+ g_free(config_service->config_ident);
+ g_free(config_service->config_entry);
+ g_free(config_service);
}
static void check_keys(GKeyFile *keyfile, const char *group,
service->passphrase = str;
}
+ service->config_ident = g_strdup(config->ident);
+ service->config_entry = g_strdup_printf("service_%s", service->ident);
+
if (service_created)
g_hash_table_insert(config->service_table, service->ident,
service);
config = g_hash_table_lookup(config_table, ident);
if (config != NULL) {
+ int ret;
+
g_hash_table_remove_all(config->service_table);
load_config(config);
- __connman_service_provision_changed(ident);
+ ret = __connman_service_provision_changed(ident);
+ if (ret > 0) {
+ /*
+ * Re-scan the config file for any
+ * changes
+ */
+ g_hash_table_remove_all(config->service_table);
+ load_config(config);
+ __connman_service_provision_changed(ident);
+ }
}
}
{
DBG("");
+ cleanup = TRUE;
+
remove_watch();
g_hash_table_destroy(config_table);
config_table = NULL;
+
+ cleanup = FALSE;
}
static char *config_pem_fsid(const char *pem_file)
struct connman_service *service = user_data;
struct connman_config_service *config = value;
struct connman_network *network;
- const void *ssid;
+ const void *ssid, *service_id;
unsigned int ssid_len;
/* For now only WiFi service entries are supported */
if (memcmp(config->ssid, ssid, ssid_len) != 0)
return;
+ service_id = __connman_service_get_ident(service);
+ config->service_identifiers =
+ g_slist_prepend(config->service_identifiers,
+ g_strdup(service_id));
+
__connman_service_set_immutable(service, TRUE);
- __connman_service_set_favorite(service, TRUE);
+ __connman_service_set_favorite_delayed(service, TRUE, TRUE);
+
+ __connman_service_set_config(service, config->config_ident,
+ config->config_entry);
if (config->eap != NULL)
__connman_service_set_string(service, "EAP", config->eap);
if (config->passphrase != NULL)
__connman_service_set_string(service, "Passphrase", config->passphrase);
+
+ __connman_service_mark_dirty();
+
+ __connman_service_save(service);
}
int __connman_config_provision_service(struct connman_service *service)
}
int __connman_config_provision_service_ident(struct connman_service *service,
- const char *ident)
+ const char *ident, const char *file, const char *entry)
{
enum connman_service_type type;
struct connman_config *config;
+ int ret = 0;
DBG("service %p", service);
return -ENOSYS;
config = g_hash_table_lookup(config_table, ident);
- if(config != NULL)
+ if(config != NULL) {
+ GHashTableIter iter;
+ gpointer value, key;
+ gboolean found = FALSE;
+
+ g_hash_table_iter_init(&iter, config->service_table);
+
+ /*
+ * Check if we need to remove individual service if it
+ * is missing from config file.
+ */
+ if (file != NULL && entry != NULL) {
+ while (g_hash_table_iter_next(&iter, &key,
+ &value) == TRUE) {
+ struct connman_config_service *config = value;
+
+ if (g_strcmp0(config->config_ident,
+ file) == 0 &&
+ g_strcmp0(config->config_entry,
+ entry) == 0) {
+ found = TRUE;
+ break;
+ }
+ }
+
+ DBG("found %d ident %s file %s entry %s", found, ident,
+ file, entry);
+
+ if (found == FALSE) {
+ /*
+ * The entry+8 will skip "service_" prefix
+ */
+ g_hash_table_remove(config->service_table,
+ entry + 8);
+ ret = 1;
+ }
+ }
+
g_hash_table_foreach(config->service_table,
provision_service, service);
+ }
- return 0;
+ return ret;
}
projects / framework / connectivity / connman.git / blobdiff