X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=94ef7b66ecc8fb1b43d80befe98af5026c8f6b09;hb=0e9992014e61671dc81685b7ce87c2da39b877fc;hp=9c06fe972af42d9f15f31d9e18da76ba9b34a9c4;hpb=c1afcdbfc5ee7289c43eb924a23f9192e01b801d;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/service.c b/src/service.c index 9c06fe9..94ef7b6 100644 --- a/src/service.c +++ b/src/service.c @@ -44,6 +44,7 @@ static GHashTable *service_hash = NULL; static GSList *counter_list = NULL; static unsigned int autoconnect_timeout = 0; static struct connman_service *current_default = NULL; +static connman_bool_t services_dirty = FALSE; struct connman_stats { connman_bool_t valid; @@ -118,6 +119,8 @@ struct connman_service { connman_bool_t do_split_routing; connman_bool_t new_service; connman_bool_t hidden_service; + char *config_file; + char *config_entry; }; struct find_data { @@ -676,6 +679,15 @@ static int service_save(struct connman_service *service) g_key_file_set_boolean(keyfile, service->identifier, "Hidden", TRUE); + if (service->config_file != NULL && strlen(service->config_file) > 0) + g_key_file_set_string(keyfile, service->identifier, + "Config.file", service->config_file); + + if (service->config_entry != NULL && + strlen(service->config_entry) > 0) + g_key_file_set_string(keyfile, service->identifier, + "Config.ident", service->config_entry); + done: __connman_storage_save_service(keyfile, service->identifier); @@ -684,6 +696,11 @@ done: return err; } +void __connman_service_save(struct connman_service *service) +{ + service_save(service); +} + static enum connman_service_state combine_state( enum connman_service_state state_a, enum connman_service_state state_b) @@ -940,25 +957,38 @@ static void update_nameservers(struct connman_service *service) if (service->nameservers_config != NULL) { int i; - for (i = 0; service->nameservers_config[i] != NULL; i++) { + remove_nameservers(service, ifname, service->nameservers); + + i = g_strv_length(service->nameservers_config); + while (i != 0) { + i--; connman_resolver_append(ifname, NULL, - service->nameservers_config[i]); + service->nameservers_config[i]); } } else if (service->nameservers != NULL) { int i; - for (i = 0; service->nameservers[i] != NULL; i++) { + i = g_strv_length(service->nameservers); + while (i != 0) { + i--; connman_resolver_append(ifname, NULL, - service->nameservers[i]); + service->nameservers[i]); } } if (service->domains != NULL) { + char *searchdomains[2] = {NULL, NULL}; int i; - for (i = 0; service->domains[i]; i++) + searchdomains[0] = service->domainname; + remove_searchdomains(service, ifname, searchdomains); + + i = g_strv_length(service->domains); + while (i != 0) { + i--; connman_resolver_append(ifname, service->domains[i], NULL); + } } else if (service->domainname != NULL) connman_resolver_append(ifname, service->domainname, NULL); @@ -1506,14 +1536,14 @@ static void append_ipv6config(DBusMessageIter *iter, void *user_data) iter); } -static void append_nameserver(DBusMessageIter *iter, char ***nameservers) +static void append_nameservers(DBusMessageIter *iter, char **servers) { - char **servers; int i; - servers = *nameservers; + DBG("%p", servers); for (i = 0; servers[i] != NULL; i++) { + DBG("servers[%d] %s", i, servers[i]); dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &servers[i]); } @@ -1527,30 +1557,25 @@ static void append_dns(DBusMessageIter *iter, void *user_data) return; if (service->nameservers_config != NULL) { - append_nameserver(iter, &service->nameservers_config); + append_nameservers(iter, service->nameservers_config); return; } else { if (service->nameservers != NULL) - append_nameserver(iter, &service->nameservers); + append_nameservers(iter, service->nameservers); if (service->nameservers_auto != NULL) - append_nameserver(iter, &service->nameservers_auto); + append_nameservers(iter, service->nameservers_auto); } } static void append_dnsconfig(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - int i; if (service->nameservers_config == NULL) return; - for (i = 0; service->nameservers_config[i]; i++) { - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, - &service->nameservers_config[i]); - } + append_nameservers(iter, service->nameservers_config); } static void append_ts(DBusMessageIter *iter, void *user_data) @@ -3016,10 +3041,12 @@ static DBusMessage *set_property(DBusConnection *conn, const char *val; dbus_message_iter_get_basic(&entry, &val); dbus_message_iter_next(&entry); - if (str->len > 0) - g_string_append_printf(str, " %s", val); - else - g_string_append(str, val); + if (connman_inet_check_ipaddress(val) > 0) { + if (str->len > 0) + g_string_append_printf(str, " %s", val); + else + g_string_append(str, val); + } } remove_nameservers(service, NULL, service->nameservers_config); @@ -3546,22 +3573,17 @@ static DBusMessage *disconnect_service(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static DBusMessage *remove_service(DBusConnection *conn, - DBusMessage *msg, void *user_data) +gboolean __connman_service_remove(struct connman_service *service) { - struct connman_service *service = user_data; - - DBG("service %p", service); - if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET) - return __connman_error_not_supported(msg); + return FALSE; if (service->immutable == TRUE || service->hidden == TRUE) - return __connman_error_not_supported(msg); + return FALSE; if (service->favorite == FALSE && service->state != CONNMAN_SERVICE_STATE_FAILURE) - return __connman_error_not_supported(msg); + return FALSE; set_reconnect_state(service, FALSE); @@ -3570,11 +3592,37 @@ static DBusMessage *remove_service(DBusConnection *conn, g_free(service->passphrase); service->passphrase = NULL; + g_free(service->agent_passphrase); + service->agent_passphrase = NULL; + + g_free(service->identity); + service->identity = NULL; + + g_free(service->agent_identity); + service->agent_identity = NULL; + + g_free(service->eap); + service->eap = NULL; + set_idle(service); __connman_service_set_favorite(service, FALSE); + service_save(service); + return TRUE; +} + +static DBusMessage *remove_service(DBusConnection *conn, + DBusMessage *msg, void *user_data) +{ + struct connman_service *service = user_data; + + DBG("service %p", service); + + if (__connman_service_remove(service) == FALSE) + return __connman_error_not_supported(msg); + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } @@ -3986,6 +4034,8 @@ static void service_free(gpointer user_data) g_free(service->private_key_file); g_free(service->private_key_passphrase); g_free(service->phase2); + g_free(service->config_file); + g_free(service->config_entry); if (service->stats.timer != NULL) g_timer_destroy(service->stats.timer); @@ -4333,15 +4383,22 @@ connman_bool_t __connman_service_wps_enabled(struct connman_service *service) return service->wps; } +void __connman_service_mark_dirty() + { + services_dirty = TRUE; + } + /** - * __connman_service_set_favorite: + * __connman_service_set_favorite_delayed: * @service: service structure * @favorite: favorite value + * @delay_ordering: do not order service sequence * * Change the favorite setting of service */ -int __connman_service_set_favorite(struct connman_service *service, - connman_bool_t favorite) +int __connman_service_set_favorite_delayed(struct connman_service *service, + connman_bool_t favorite, + gboolean delay_ordering) { GSequenceIter *iter; @@ -4355,20 +4412,39 @@ int __connman_service_set_favorite(struct connman_service *service, return -EALREADY; service->favorite = favorite; - service->order = __connman_service_get_order(service); + + if (delay_ordering == FALSE) + service->order = __connman_service_get_order(service); favorite_changed(service); - if (g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); - } + if (delay_ordering == FALSE) { - __connman_connection_update_gateway(); + if (g_sequence_get_length(service_list) > 1) { + g_sequence_sort_changed(iter, service_compare, NULL); + service_schedule_changed(); + } + + __connman_connection_update_gateway(); + } return 0; } +/** + * __connman_service_set_favorite: + * @service: service structure + * @favorite: favorite value + * + * Change the favorite setting of service + */ +int __connman_service_set_favorite(struct connman_service *service, + connman_bool_t favorite) +{ + return __connman_service_set_favorite_delayed(service, favorite, + FALSE); +} + int __connman_service_set_immutable(struct connman_service *service, connman_bool_t immutable) { @@ -4844,7 +4920,7 @@ int __connman_service_clear_error(struct connman_service *service) service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_UNKNOWN; - service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;; + service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; if (service->favorite == TRUE) set_reconnect_state(service, TRUE); @@ -5426,17 +5502,62 @@ static struct connman_service *lookup_by_identifier(const char *identifier) return NULL; } +struct provision_user_data { + const char *ident; + int ret; +}; + static void provision_changed(gpointer value, gpointer user_data) { struct connman_service *service = value; - char *path = user_data; + struct provision_user_data *data = user_data; + const char *path = data->ident; + int ret; - __connman_config_provision_service_ident(service, path); + ret = __connman_config_provision_service_ident(service, path, + service->config_file, service->config_entry); + if (ret > 0) + data->ret = ret; } -void __connman_service_provision_changed(const char *ident) +int __connman_service_provision_changed(const char *ident) { - g_sequence_foreach(service_list, provision_changed, (void *)ident); + struct provision_user_data data = { + .ident = ident, + .ret = 0 + }; + + g_sequence_foreach(service_list, provision_changed, (void *)&data); + + /* + * Because the provision_changed() might have set some services + * as favorite, we must sort the sequence now. + */ + if (services_dirty == TRUE) { + services_dirty = FALSE; + + if (g_sequence_get_length(service_list) > 1) { + g_sequence_sort(service_list, service_compare, NULL); + service_schedule_changed(); + } + + __connman_connection_update_gateway(); + } + + return data.ret; +} + +void __connman_service_set_config(struct connman_service *service, + const char *file_id, const char *entry) +{ + if (service == NULL) + return; + + g_free(service->config_file); + service->config_file = g_strdup(file_id); + + g_free(service->config_entry); + service->config_entry = g_strdup(entry); } /** @@ -5754,6 +5875,11 @@ struct connman_service *__connman_service_lookup_from_index(int index) return NULL; } +struct connman_service *__connman_service_lookup_from_ident(const char *identifier) +{ + return lookup_by_identifier(identifier); +} + const char *__connman_service_get_ident(struct connman_service *service) { return service->identifier; @@ -6154,6 +6280,66 @@ __connman_service_create_from_provider(struct connman_provider *provider) return service; } +static void remove_unprovisioned_services() +{ + gchar **services; + GKeyFile *keyfile, *configkeyfile; + char *file, *section; + int i = 0; + + services = connman_storage_get_services(); + if (services == NULL) + return; + + for (;services[i] != NULL; i++) { + file = section = NULL; + keyfile = configkeyfile = NULL; + + keyfile = connman_storage_load_service(services[i]); + if (keyfile == NULL) + continue; + + file = g_key_file_get_string(keyfile, services[i], + "Config.file", NULL); + if (file == NULL) + goto next; + + section = g_key_file_get_string(keyfile, services[i], + "Config.ident", NULL); + if (section == NULL) + goto next; + + configkeyfile = __connman_storage_load_config(file); + if (configkeyfile == NULL) { + /* + * Config file is missing, remove the provisioned + * service. + */ + __connman_storage_remove_service(services[i]); + goto next; + } + + if (g_key_file_has_group(configkeyfile, section) == FALSE) + /* + * Config section is missing, remove the provisioned + * service. + */ + __connman_storage_remove_service(services[i]); + + next: + if (keyfile != NULL) + g_key_file_free(keyfile); + + if (configkeyfile != NULL) + g_key_file_free(configkeyfile); + + g_free(section); + g_free(file); + } + + g_strfreev(services); +} + int __connman_service_init(void) { DBG(""); @@ -6170,6 +6356,8 @@ int __connman_service_init(void) g_str_equal, g_free, NULL); services_notify->add = g_hash_table_new(g_str_hash, g_str_equal); + remove_unprovisioned_services(); + return 0; }