X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fconfig.c;h=ba463668d8b1a109f40a8c566a9388f2e5559640;hb=3ba2d070a7349a0f35e74be9eb995d43db5e7a7c;hp=dcef4e53118ce52bc53b7c7ea1b61d7846013302;hpb=a667e05447dc2276a4e359a41a1604e20da17689;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/config.c b/src/config.c index dcef4e5..ba46366 100644 --- a/src/config.c +++ b/src/config.c @@ -2,7 +2,7 @@ * * 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 @@ -23,6 +23,7 @@ #include #endif +#include #include #include #include @@ -53,19 +54,24 @@ struct connman_config { char *ident; char *name; char *description; + connman_bool_t protected; GHashTable *service_table; }; static GHashTable *config_table = NULL; +static GSList *protected_services = NULL; static int inotify_wd = -1; static GIOChannel *inotify_channel = NULL; static uint inotify_watch = 0; +#define INTERNAL_CONFIG_PREFIX "__internal" + /* Definition of possible strings in the .config files */ #define CONFIG_KEY_NAME "Name" #define CONFIG_KEY_DESC "Description" +#define CONFIG_KEY_PROT "Protected" #define SERVICE_KEY_TYPE "Type" #define SERVICE_KEY_NAME "Name" @@ -83,6 +89,7 @@ static uint inotify_watch = 0; static const char *config_possible_keys[] = { CONFIG_KEY_NAME, CONFIG_KEY_DESC, + CONFIG_KEY_PROT, NULL, }; @@ -122,6 +129,8 @@ static void unregister_service(gpointer 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); @@ -165,6 +174,34 @@ static void check_keys(GKeyFile *keyfile, const char *group, g_strfreev(avail_keys); } +static connman_bool_t +is_protected_service(struct connman_config_service *service) +{ + GSList *list; + + DBG("ident %s", service->ident); + + for (list = protected_services; list; list = list->next) { + struct connman_config_service *s = list->data; + + if (g_strcmp0(s->type, service->type) != 0) + continue; + + 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; + } + } + + return FALSE; +} + static int load_service(GKeyFile *keyfile, const char *group, struct connman_config *config) { @@ -172,6 +209,7 @@ static int load_service(GKeyFile *keyfile, const char *group, const char *ident; char *str, *hex_ssid; gboolean service_created = FALSE; + int err; /* Strip off "service_" prefix */ ident = group + 8; @@ -214,12 +252,19 @@ static int load_service(GKeyFile *keyfile, const char *group, 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) { - 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; } @@ -234,8 +279,10 @@ static int load_service(GKeyFile *keyfile, const char *group, 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); @@ -243,6 +290,12 @@ static int load_service(GKeyFile *keyfile, const char *group, service->ssid_len = ssid_len; } + if (is_protected_service(service) == TRUE) { + connman_error("Trying to provision a protected service"); + err = -EACCES; + goto err; + } + str = g_key_file_get_string(keyfile, group, SERVICE_KEY_EAP, NULL); if (str != NULL) { g_free(service->eap); @@ -304,22 +357,39 @@ static int load_service(GKeyFile *keyfile, const char *group, g_hash_table_insert(config->service_table, service->ident, service); + if (config->protected == TRUE) + protected_services = + g_slist_append(protected_services, 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; + 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; @@ -338,16 +408,30 @@ static int load_config(struct connman_config *config) config->description = str; } + protected = g_key_file_get_boolean(keyfile, "global", + CONFIG_KEY_PROT, &error); + if (error == NULL) + config->protected = protected; + else + config->protected = TRUE; + 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; } @@ -377,6 +461,20 @@ static struct connman_config *create_config(const char *ident) return config; } +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; @@ -404,12 +502,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); } @@ -482,8 +582,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); @@ -495,6 +597,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); } } @@ -637,6 +740,7 @@ static void provision_service(gpointer key, gpointer value, gpointer user_data) return; __connman_service_set_immutable(service, TRUE); + __connman_service_set_favorite(service, TRUE); if (config->eap != NULL) @@ -713,3 +817,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; +}