From bdfc384df5fbe96990d872f9a1be2f5066c91ae2 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Mon, 12 Nov 2012 14:07:26 +0200 Subject: provider: Remove functionality that is no longer used The VPN support functionality is moved into connman-vpnd. --- include/provider.h | 3 + src/provider.c | 958 ++++------------------------------------------------- 2 files changed, 71 insertions(+), 890 deletions(-) diff --git a/include/provider.h b/include/provider.h index dc86bcac..67df67a2 100644 --- a/include/provider.h +++ b/include/provider.h @@ -93,6 +93,7 @@ int connman_provider_set_ipaddress(struct connman_provider *provider, struct connman_ipaddress *ipaddress); int connman_provider_set_pac(struct connman_provider *provider, const char *pac); +int connman_provider_create_service(struct connman_provider *provider); int connman_provider_set_domain(struct connman_provider *provider, const char *domain); int connman_provider_set_nameservers(struct connman_provider *provider, @@ -120,6 +121,8 @@ struct connman_provider_driver { int connman_provider_driver_register(struct connman_provider_driver *driver); void connman_provider_driver_unregister(struct connman_provider_driver *driver); +void connman_provider_set_driver(struct connman_provider *provider, + struct connman_provider_driver *driver); #ifdef __cplusplus } diff --git a/src/provider.c b/src/provider.c index c93a7925..977f1f18 100644 --- a/src/provider.c +++ b/src/provider.c @@ -50,311 +50,52 @@ struct connman_provider { struct connman_service *vpn_service; int index; char *identifier; - char *name; - char *type; - char *host; - char *domain; int family; GHashTable *routes; struct connman_provider_driver *driver; void *driver_data; - GHashTable *setting_strings; GHashTable *user_routes; gchar **user_networks; gsize num_user_networks; - GResolv *resolv; - char **host_ip; }; -static void resolv_result(GResolvResultStatus status, - char **results, gpointer user_data) -{ - struct connman_provider *provider = user_data; - - DBG("status %d", status); - - if (status == G_RESOLV_RESULT_STATUS_SUCCESS && results != NULL && - g_strv_length(results) > 0) - provider->host_ip = g_strdupv(results); - - connman_provider_unref(provider); -} - -static void provider_resolv_host_addr(struct connman_provider *provider) +void __connman_provider_append_properties(struct connman_provider *provider, + DBusMessageIter *iter) { - if (provider->host == NULL) - return; + const char *host, *domain, *type; - if (connman_inet_check_ipaddress(provider->host) > 0) + if (provider->driver == NULL || provider->driver->get_property == NULL) return; - if (provider->host_ip != NULL) - return; + host = provider->driver->get_property(provider, "Host"); + domain = provider->driver->get_property(provider, "Domain"); + type = provider->driver->get_property(provider, "Type"); - /* - * If the hostname is not numeric, try to resolv it. We do not wait - * the result as it might take some time. We will get the result - * before VPN will feed routes to us because VPN client will need - * the IP address also before VPN connection can be established. - */ - provider->resolv = g_resolv_new(0); - if (provider->resolv == NULL) { - DBG("Cannot resolv %s", provider->host); - return; - } - - DBG("Trying to resolv %s", provider->host); - - connman_provider_ref(provider); - - g_resolv_lookup_hostname(provider->resolv, provider->host, - resolv_result, provider); -} - -void __connman_provider_append_properties(struct connman_provider *provider, - DBusMessageIter *iter) -{ - if (provider->host != NULL) + if (host != NULL) connman_dbus_dict_append_basic(iter, "Host", - DBUS_TYPE_STRING, &provider->host); + DBUS_TYPE_STRING, &host); - if (provider->domain != NULL) + if (domain != NULL) connman_dbus_dict_append_basic(iter, "Domain", - DBUS_TYPE_STRING, &provider->domain); + DBUS_TYPE_STRING, &domain); - if (provider->type != NULL) + if (type != NULL) connman_dbus_dict_append_basic(iter, "Type", DBUS_TYPE_STRING, - &provider->type); -} - -int __connman_provider_append_user_route(struct connman_provider *provider, - int family, const char *network, const char *netmask) -{ - struct connman_route *route; - char *key = g_strdup_printf("%d/%s/%s", family, network, netmask); - - DBG("family %d network %s netmask %s", family, network, netmask); - - route = g_hash_table_lookup(provider->user_routes, key); - if (route == NULL) { - route = g_try_new0(struct connman_route, 1); - if (route == NULL) { - connman_error("out of memory"); - return -ENOMEM; - } - - route->family = family; - route->host = g_strdup(network); - route->netmask = g_strdup(netmask); - - g_hash_table_replace(provider->user_routes, key, route); - } else - g_free(key); - - return 0; -} - -static void set_user_networks(struct connman_provider *provider, - char **networks) -{ - int i = 0; - - while (networks[i] != NULL) { - char **elems = g_strsplit(networks[i], "/", 0); - char *network, *netmask; - int family = PF_UNSPEC, ret; - - if (elems == NULL) - break; - - network = elems[0]; - if (network == NULL || *network == '\0') { - DBG("no network/netmask set"); - g_strfreev(elems); - break; - } - - netmask = elems[1]; - if (netmask != NULL && *netmask == '\0') { - DBG("no netmask set"); - g_strfreev(elems); - break; - } - - if (g_strrstr(network, ":") != NULL) - family = AF_INET6; - else if (g_strrstr(network, ".") != NULL) { - family = AF_INET; - - if (g_strrstr(netmask, ".") == NULL) { - /* We have netmask length */ - in_addr_t addr; - struct in_addr netmask_in; - unsigned char prefix_len = 32; - - if (netmask != NULL) - prefix_len = atoi(netmask); - - addr = 0xffffffff << (32 - prefix_len); - netmask_in.s_addr = htonl(addr); - netmask = inet_ntoa(netmask_in); - - DBG("network %s netmask %s", network, netmask); - } - } - - ret = __connman_provider_append_user_route(provider, - family, network, netmask); - g_strfreev(elems); - - if (ret != 0) - break; - - i++; - } + &type); } -static int provider_load_from_keyfile(struct connman_provider *provider, - GKeyFile *keyfile) -{ - gsize idx = 0; - gchar **settings; - gchar *key, *value; - gsize length; - - settings = g_key_file_get_keys(keyfile, provider->identifier, &length, - NULL); - if (settings == NULL) { - g_key_file_free(keyfile); - return -ENOENT; - } - - while (idx < length) { - key = settings[idx]; - if (key != NULL) { - if (g_str_equal(key, "Networks") == TRUE) { - g_strfreev(provider->user_networks); - provider->user_networks = - g_key_file_get_string_list(keyfile, - provider->identifier, - key, - &provider->num_user_networks, - NULL); - } else { - value = g_key_file_get_string(keyfile, - provider->identifier, - key, NULL); - connman_provider_set_string(provider, key, - value); - g_free(value); - } - } - idx += 1; - } - g_strfreev(settings); - - if (provider->user_networks != NULL) - set_user_networks(provider, provider->user_networks); - - return 0; -} - -static int connman_provider_load(struct connman_provider *provider) -{ - GKeyFile *keyfile; - - DBG("provider %p", provider); - - keyfile = __connman_storage_load_provider(provider->identifier); - if (keyfile == NULL) - return -ENOENT; - - provider_load_from_keyfile(provider, keyfile); - - g_key_file_free(keyfile); - return 0; -} - -static int connman_provider_save(struct connman_provider *provider) -{ - GKeyFile *keyfile; - - DBG("provider %p", provider); - - keyfile = g_key_file_new(); - if (keyfile == NULL) - return -ENOMEM; - - g_key_file_set_string(keyfile, provider->identifier, - "Name", provider->name); - g_key_file_set_string(keyfile, provider->identifier, - "Type", provider->type); - g_key_file_set_string(keyfile, provider->identifier, - "Host", provider->host); - g_key_file_set_string(keyfile, provider->identifier, - "VPN.Domain", provider->domain); - if (provider->user_networks != NULL) - g_key_file_set_string_list(keyfile, provider->identifier, - "Networks", - (const gchar **)provider->user_networks, - provider->num_user_networks); - - if (provider->driver != NULL && provider->driver->save != NULL) - provider->driver->save(provider, keyfile); - - __connman_storage_save_provider(keyfile, provider->identifier); - g_key_file_free(keyfile); - - return 0; -} - -static struct connman_provider *connman_provider_lookup(const char *identifier) +struct connman_provider * +connman_provider_ref_debug(struct connman_provider *provider, + const char *file, int line, const char *caller) { - struct connman_provider *provider = NULL; + DBG("%p ref %d by %s:%d:%s()", provider, provider->refcount + 1, + file, line, caller); - provider = g_hash_table_lookup(provider_hash, identifier); + __sync_fetch_and_add(&provider->refcount, 1); return provider; } -static gboolean match_driver(struct connman_provider *provider, - struct connman_provider_driver *driver) -{ - if (g_strcmp0(driver->name, provider->type) == 0) - return TRUE; - - return FALSE; -} - -static int provider_probe(struct connman_provider *provider) -{ - GSList *list; - - DBG("provider %p name %s", provider, provider->name); - - if (provider->driver != NULL) - return -EALREADY; - - for (list = driver_list; list; list = list->next) { - struct connman_provider_driver *driver = list->data; - - if (match_driver(provider, driver) == FALSE) - continue; - - DBG("driver %p name %s", driver, driver->name); - - if (driver->probe != NULL && driver->probe(provider) == 0) { - provider->driver = driver; - break; - } - } - - if (provider->driver == NULL) - return -ENODEV; - - return 0; -} - static void provider_remove(struct connman_provider *provider) { if (provider->driver != NULL) { @@ -363,46 +104,14 @@ static void provider_remove(struct connman_provider *provider) } } -static int provider_register(struct connman_provider *provider) -{ - return provider_probe(provider); -} - -static void provider_unregister(struct connman_provider *provider) -{ - provider_remove(provider); -} - -struct connman_provider * -connman_provider_ref_debug(struct connman_provider *provider, - const char *file, int line, const char *caller) -{ - DBG("%p ref %d by %s:%d:%s()", provider, provider->refcount + 1, - file, line, caller); - - __sync_fetch_and_add(&provider->refcount, 1); - - return provider; -} - static void provider_destruct(struct connman_provider *provider) { DBG("provider %p", provider); - g_free(provider->name); - g_free(provider->type); - g_free(provider->host); - g_free(provider->domain); g_free(provider->identifier); g_strfreev(provider->user_networks); g_hash_table_destroy(provider->routes); g_hash_table_destroy(provider->user_routes); - g_hash_table_destroy(provider->setting_strings); - if (provider->resolv != NULL) { - g_resolv_unref(provider->resolv); - provider->resolv = NULL; - } - g_strfreev(provider->host_ip); g_free(provider); } @@ -464,7 +173,6 @@ int __connman_provider_connect(struct connman_provider *provider) DBG("provider %p", provider); if (provider->driver != NULL && provider->driver->connect != NULL) { - provider_resolv_host_addr(provider); err = provider->driver->connect(provider); } else return -EOPNOTSUPP; @@ -503,7 +211,10 @@ int __connman_provider_remove(const char *path) if (g_strcmp0(srv_path, path) == 0) { DBG("Removing VPN %s", provider->identifier); - provider_unregister(provider); + if (provider->driver != NULL && + provider->driver->remove) + provider->driver->remove(provider); + g_hash_table_remove(provider_hash, provider->identifier); return 0; @@ -513,52 +224,6 @@ int __connman_provider_remove(const char *path) return -ENXIO; } -static connman_bool_t check_host(char **hosts, char *host) -{ - int i; - - if (hosts == NULL) - return FALSE; - - for (i = 0; hosts[i] != NULL; i++) { - if (g_strcmp0(hosts[i], host) == 0) - return TRUE; - } - - return FALSE; -} - -static void provider_append_routes(gpointer key, gpointer value, - gpointer user_data) -{ - struct connman_route *route = value; - struct connman_provider *provider = user_data; - int index = provider->index; - - /* - * If the VPN administrator/user has given a route to - * VPN server, then we must discard that because the - * server cannot be contacted via VPN tunnel. - */ - if (check_host(provider->host_ip, route->host) == TRUE) { - DBG("Discarding VPN route to %s via %s at index %d", - route->host, route->gateway, index); - return; - } - - if (route->family == AF_INET6) { - unsigned char prefix_len = atoi(route->netmask); - - connman_inet_add_ipv6_network_route(index, route->host, - route->gateway, - prefix_len); - } else { - connman_inet_add_network_route(index, route->host, - route->gateway, - route->netmask); - } -} - static int set_connected(struct connman_provider *provider, connman_bool_t connected) { @@ -583,12 +248,6 @@ static int set_connected(struct connman_provider *provider, provider_indicate_state(provider, CONNMAN_SERVICE_STATE_READY); - g_hash_table_foreach(provider->routes, provider_append_routes, - provider); - - g_hash_table_foreach(provider->user_routes, provider_append_routes, - provider); - } else { if (ipconfig != NULL) { provider_indicate_state(provider, @@ -654,131 +313,7 @@ int connman_provider_indicate_error(struct connman_provider *provider, service_error); } -static void unregister_provider(gpointer data) -{ - struct connman_provider *provider = data; - - DBG("provider %p service %p", provider, provider->vpn_service); - - if (provider->vpn_service != NULL) { - connman_service_unref(provider->vpn_service); - provider->vpn_service = NULL; - } - - connman_provider_unref(provider); -} - -static void destroy_route(gpointer user_data) -{ - struct connman_route *route = user_data; - - g_free(route->host); - g_free(route->netmask); - g_free(route->gateway); - g_free(route); -} - -static void provider_initialize(struct connman_provider *provider) -{ - DBG("provider %p", provider); - - provider->index = 0; - provider->name = NULL; - provider->type = NULL; - provider->domain = NULL; - provider->identifier = NULL; - provider->user_networks = NULL; - provider->routes = g_hash_table_new_full(g_direct_hash, g_direct_equal, - NULL, destroy_route); - provider->user_routes = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, destroy_route); - provider->setting_strings = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); -} - -static struct connman_provider *connman_provider_new(void) -{ - struct connman_provider *provider; - - provider = g_try_new0(struct connman_provider, 1); - if (provider == NULL) - return NULL; - - provider->refcount = 1; - - DBG("provider %p", provider); - provider_initialize(provider); - - return provider; -} - -static struct connman_provider *connman_provider_get(const char *identifier) -{ - struct connman_provider *provider; - - provider = g_hash_table_lookup(provider_hash, identifier); - if (provider != NULL) - return provider; - - provider = connman_provider_new(); - if (provider == NULL) - return NULL; - - DBG("provider %p", provider); - - provider->identifier = g_strdup(identifier); - - g_hash_table_insert(provider_hash, provider->identifier, provider); - - return provider; -} - -static void provider_dbus_ident(char *ident) -{ - int i, len = strlen(ident); - - for (i = 0; i < len; i++) { - if (ident[i] >= '0' && ident[i] <= '9') - continue; - if (ident[i] >= 'a' && ident[i] <= 'z') - continue; - if (ident[i] >= 'A' && ident[i] <= 'Z') - continue; - ident[i] = '_'; - } -} - -static struct connman_provider *provider_create_from_keyfile(GKeyFile *keyfile, - const char *ident) -{ - struct connman_provider *provider; - - if (keyfile == NULL || ident == NULL) - return NULL; - - provider = connman_provider_lookup(ident); - if (provider == NULL) { - provider = connman_provider_get(ident); - if (provider == NULL) { - DBG("can not create provider"); - return NULL; - } - - provider_load_from_keyfile(provider, keyfile); - - if (provider->name == NULL || provider->host == NULL || - provider->domain == NULL) { - DBG("cannot get name, host or domain"); - connman_provider_unref(provider); - return NULL; - } - - provider_register(provider); - } - return provider; -} - -static int provider_create_service(struct connman_provider *provider) +int connman_provider_create_service(struct connman_provider *provider) { if (provider->vpn_service != NULL) { connman_bool_t connected; @@ -799,262 +334,34 @@ static int provider_create_service(struct connman_provider *provider) provider->vpn_service = __connman_service_create_from_provider(provider); - if (provider->vpn_service == NULL) - return -EOPNOTSUPP; - - return 0; -} - -static void provider_create_all_from_type(const char *provider_type) -{ - unsigned int i; - char **providers; - char *id, *type; - GKeyFile *keyfile; - struct connman_provider *provider; - - DBG("provider type %s", provider_type); - - providers = __connman_storage_get_providers(); - - for (i = 0; providers[i] != NULL; i+=1) { - - if (strncmp(providers[i], "provider_", 9) != 0) - continue; - - id = providers[i] + 9; - keyfile = __connman_storage_load_provider(id); - - if (keyfile == NULL) - continue; - - type = g_key_file_get_string(keyfile, id, "Type", NULL); - - DBG("keyfile %p id %s type %s", keyfile, id, type); - - if (strcmp(provider_type, type) != 0) { - g_free(type); - g_key_file_free(keyfile); - continue; - } - - provider = provider_create_from_keyfile(keyfile, id); - if (provider != NULL) { - if (provider_create_service(provider) == -EOPNOTSUPP) { - DBG("could not create service"); - connman_provider_unref(provider); - } - } + if (provider->vpn_service == NULL) { + connman_warn("service creation failed for provider %s", + provider->identifier); - g_free(type); - g_key_file_free(keyfile); - } - g_strfreev(providers); -} - -static char **get_user_networks(DBusMessageIter *array, int *count) -{ - DBusMessageIter entry; - char **networks = NULL; - GSList *list = NULL, *l; - int len; - - dbus_message_iter_recurse(array, &entry); - - while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) { - const char *val; - dbus_message_iter_get_basic(&entry, &val); - - list = g_slist_prepend(list, g_strdup(val)); - dbus_message_iter_next(&entry); + g_hash_table_remove(provider_hash, provider->identifier); + return -EOPNOTSUPP; } - len = g_slist_length(list); - if (len == 0) - goto out; - - networks = g_try_new(char *, len + 1); - if (networks == NULL) - goto out; - - *count = len; - networks[len] = 0; - - for (l = list; l != NULL; l = g_slist_next(l)) - networks[--len] = l->data; - -out: - g_slist_free(list); - - return networks; + return 0; } int __connman_provider_create_and_connect(DBusMessage *msg) { - struct connman_provider *provider; - DBusMessageIter iter, array; - const char *type = NULL, *name = NULL, *service_path; - const char *host = NULL, *domain = NULL; - char **networks = NULL; - char *ident; - int err, count = 0; - connman_bool_t connecting = FALSE; - - dbus_message_iter_init(msg, &iter); - dbus_message_iter_recurse(&iter, &array); - - while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) { - DBusMessageIter entry, value; - const char *key; - - dbus_message_iter_recurse(&array, &entry); - dbus_message_iter_get_basic(&entry, &key); - - dbus_message_iter_next(&entry); - dbus_message_iter_recurse(&entry, &value); - - switch (dbus_message_iter_get_arg_type(&value)) { - case DBUS_TYPE_STRING: - if (g_str_equal(key, "Type") == TRUE) - dbus_message_iter_get_basic(&value, &type); - else if (g_str_equal(key, "Name") == TRUE) - dbus_message_iter_get_basic(&value, &name); - else if (g_str_equal(key, "Host") == TRUE) - dbus_message_iter_get_basic(&value, &host); - else if (g_str_equal(key, "VPN.Domain") == TRUE) - dbus_message_iter_get_basic(&value, &domain); - break; - case DBUS_TYPE_ARRAY: - if (g_str_equal(key, "Networks") == TRUE) - networks = get_user_networks(&value, &count); - break; - } - - dbus_message_iter_next(&array); - } + struct connman_provider_driver *driver; - if (host == NULL || domain == NULL) + if (driver_list == NULL) return -EINVAL; - DBG("Type %s name %s networks %p", type, name, networks); - - if (type == NULL || name == NULL) - return -EOPNOTSUPP; - - ident = g_strdup_printf("%s_%s", host, domain); - provider_dbus_ident(ident); - - DBG("ident %s", ident); - - provider = connman_provider_lookup(ident); - if (provider == NULL) { - provider = connman_provider_get(ident); - if (provider == NULL) { - DBG("can not create provider"); - g_free(ident); - return -EOPNOTSUPP; - } - - provider->host = g_strdup(host); - provider->domain = g_strdup(domain); - provider->name = g_strdup(name); - provider->type = g_strdup(type); - - if (provider_register(provider) == 0) - connman_provider_load(provider); - - provider_resolv_host_addr(provider); - } - - if (networks != NULL) { - g_strfreev(provider->user_networks); - provider->user_networks = networks; - provider->num_user_networks = count; - set_user_networks(provider, provider->user_networks); - } - - dbus_message_iter_init(msg, &iter); - dbus_message_iter_recurse(&iter, &array); - - while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) { - DBusMessageIter entry, value; - const char *key, *str; - - dbus_message_iter_recurse(&array, &entry); - dbus_message_iter_get_basic(&entry, &key); - - dbus_message_iter_next(&entry); - dbus_message_iter_recurse(&entry, &value); - - switch (dbus_message_iter_get_arg_type(&value)) { - case DBUS_TYPE_STRING: - dbus_message_iter_get_basic(&value, &str); - connman_provider_set_string(provider, key, str); - break; - } - - dbus_message_iter_next(&array); - } - - g_free(ident); - - err = provider_create_service(provider); - if (err == -EALREADY) { - DBG("provider already connected"); - } else { - if (err == -EOPNOTSUPP) { - goto unref; - } else { - if (__connman_service_is_provider_pending( - provider->vpn_service) == TRUE) { - DBG("Provider %p connection already pending", - provider); - dbus_message_ref(msg); - __connman_service_reply_dbus_pending(msg, - EINPROGRESS, NULL); - return 0; - } - - err = __connman_service_connect(provider->vpn_service); - - if (err < 0 && err != -EINPROGRESS) - goto failed; - - if (err == -EINPROGRESS) - connecting = TRUE; - } - } - - if (connecting == TRUE) { - /* - * Save the dbus message so that we can reply the - * caller when VPN connection is established. - */ - dbus_message_ref(msg); - - __connman_service_set_provider_pending(provider->vpn_service, - msg); - connman_provider_save(provider); - - return 0; - } - - service_path = __connman_service_get_path(provider->vpn_service); - g_dbus_send_reply(connection, msg, - DBUS_TYPE_OBJECT_PATH, &service_path, - DBUS_TYPE_INVALID); - return 0; - -failed: - connman_service_unref(provider->vpn_service); - provider->vpn_service = NULL; - -unref: - DBG("can not connect, delete provider"); + driver = driver_list->data; + if (driver == NULL || driver->create == NULL) + return -EINVAL; - g_hash_table_remove(provider_hash, provider->identifier); + /* + * XXX: we need a callback here which is called when connection + * is ready + */ - return err; + return driver->create(msg); } const char * __connman_provider_get_ident(struct connman_provider *provider) @@ -1068,47 +375,19 @@ const char * __connman_provider_get_ident(struct connman_provider *provider) int connman_provider_set_string(struct connman_provider *provider, const char *key, const char *value) { - DBG("provider %p key %s value %s", provider, key, value); - - if (g_str_equal(key, "Type") == TRUE) { - g_free(provider->type); - provider->type = g_strdup(value); - } else if (g_str_equal(key, "Name") == TRUE) { - g_free(provider->name); - provider->name = g_strdup(value); - } else if (g_str_equal(key, "Host") == TRUE) { - g_free(provider->host); - provider->host = g_strdup(value); - } else if (g_str_equal(key, "VPN.Domain") == TRUE) { - g_free(provider->domain); - provider->domain = g_strdup(value); - } else - g_hash_table_replace(provider->setting_strings, - g_strdup(key), g_strdup(value)); + if (provider->driver != NULL && provider->driver->set_property) + return provider->driver->set_property(provider, key, value); + return 0; } const char *connman_provider_get_string(struct connman_provider *provider, const char *key) { - DBG("provider %p key %s", provider, key); - - if (g_str_equal(key, "Type") == TRUE) - return provider->type; - else if (g_str_equal(key, "Name") == TRUE) - return provider->name; - else if (g_str_equal(key, "Host") == TRUE) - return provider->host; - else if (g_str_equal(key, "HostIP") == TRUE) { - if (provider->host_ip == NULL || - provider->host_ip[0] == NULL) - return provider->host; - else - return provider->host_ip[0]; - } else if (g_str_equal(key, "VPN.Domain") == TRUE) - return provider->domain; - - return g_hash_table_lookup(provider->setting_strings, key); + if (provider->driver != NULL && provider->driver->get_property) + return provider->driver->get_property(provider, key); + + return NULL; } connman_bool_t @@ -1224,9 +503,6 @@ int connman_provider_set_domain(struct connman_provider *provider, { DBG("provider %p domain %s", provider, domain); - g_free(provider->domain); - provider->domain = g_strdup(domain); - __connman_service_set_domainname(provider->vpn_service, domain); return 0; @@ -1257,122 +533,26 @@ int connman_provider_set_nameservers(struct connman_provider *provider, return 0; } -enum provider_route_type { - PROVIDER_ROUTE_TYPE_NONE = 0, - PROVIDER_ROUTE_TYPE_MASK = 1, - PROVIDER_ROUTE_TYPE_ADDR = 2, - PROVIDER_ROUTE_TYPE_GW = 3, -}; - -static int route_env_parse(struct connman_provider *provider, const char *key, - int *family, unsigned long *idx, - enum provider_route_type *type) -{ - char *end; - const char *start; - - DBG("name %s", provider->name); - - if (!strcmp(provider->type, "openvpn")) { - if (g_str_has_prefix(key, "route_network_") == TRUE) { - start = key + strlen("route_network_"); - *type = PROVIDER_ROUTE_TYPE_ADDR; - } else if (g_str_has_prefix(key, "route_netmask_") == TRUE) { - start = key + strlen("route_netmask_"); - *type = PROVIDER_ROUTE_TYPE_MASK; - } else if (g_str_has_prefix(key, "route_gateway_") == TRUE) { - start = key + strlen("route_gateway_"); - *type = PROVIDER_ROUTE_TYPE_GW; - } else - return -EINVAL; - - *family = AF_INET; - *idx = g_ascii_strtoull(start, &end, 10); - - } else if (!strcmp(provider->type, "openconnect")) { - if (g_str_has_prefix(key, "CISCO_SPLIT_INC_") == TRUE) { - *family = AF_INET; - start = key + strlen("CISCO_SPLIT_INC_"); - } else if (g_str_has_prefix(key, "CISCO_IPV6_SPLIT_INC_") == TRUE) { - *family = AF_INET6; - start = key + strlen("CISCO_IPV6_SPLIT_INC_"); - } else - return -EINVAL; - - *idx = g_ascii_strtoull(start, &end, 10); - - if (strncmp(end, "_ADDR", 5) == 0) - *type = PROVIDER_ROUTE_TYPE_ADDR; - else if (strncmp(end, "_MASK", 5) == 0) - *type = PROVIDER_ROUTE_TYPE_MASK; - else if (strncmp(end, "_MASKLEN", 8) == 0 && - *family == AF_INET6) { - *type = PROVIDER_ROUTE_TYPE_MASK; - } else - return -EINVAL; - } - - return 0; -} - -int connman_provider_append_route(struct connman_provider *provider, - const char *key, const char *value) +static void unregister_provider(gpointer data) { - struct connman_route *route; - int ret, family = 0; - unsigned long idx = 0; - enum provider_route_type type = PROVIDER_ROUTE_TYPE_NONE; - - DBG("key %s value %s", key, value); - - ret = route_env_parse(provider, key, &family, &idx, &type); - if (ret < 0) - return ret; - - DBG("idx %lu family %d type %d", idx, family, type); - - route = g_hash_table_lookup(provider->routes, GINT_TO_POINTER(idx)); - if (route == NULL) { - route = g_try_new0(struct connman_route, 1); - if (route == NULL) { - connman_error("out of memory"); - return -ENOMEM; - } - - route->family = family; + struct connman_provider *provider = data; - g_hash_table_replace(provider->routes, GINT_TO_POINTER(idx), - route); - } + DBG("provider %p service %p", provider, provider->vpn_service); - switch (type) { - case PROVIDER_ROUTE_TYPE_NONE: - break; - case PROVIDER_ROUTE_TYPE_MASK: - route->netmask = g_strdup(value); - break; - case PROVIDER_ROUTE_TYPE_ADDR: - route->host = g_strdup(value); - break; - case PROVIDER_ROUTE_TYPE_GW: - route->gateway = g_strdup(value); - break; + if (provider->vpn_service != NULL) { + connman_service_unref(provider->vpn_service); + provider->vpn_service = NULL; } - return 0; + connman_provider_unref(provider); } -const char *connman_provider_get_driver_name(struct connman_provider *provider) +static void clean_provider(gpointer key, gpointer value, gpointer user_data) { - if (provider->driver == NULL) - return NULL; - - return provider->driver->name; -} + struct connman_provider *provider = value; -const char *connman_provider_get_save_group(struct connman_provider *provider) -{ - return provider->identifier; + if (provider->driver != NULL && provider->driver->remove) + provider->driver->remove(provider); } static gint compare_priority(gconstpointer a, gconstpointer b) @@ -1380,21 +560,12 @@ static gint compare_priority(gconstpointer a, gconstpointer b) return 0; } -static void clean_provider(gpointer key, gpointer value, gpointer user_data) -{ - struct connman_provider *provider = value; - - if (provider->driver != NULL && provider->driver->remove) - provider->driver->remove(provider); -} - int connman_provider_driver_register(struct connman_provider_driver *driver) { DBG("driver %p name %s", driver, driver->name); driver_list = g_slist_insert_sorted(driver_list, driver, compare_priority); - provider_create_all_from_type(driver->name); return 0; } @@ -1405,12 +576,18 @@ void connman_provider_driver_unregister(struct connman_provider_driver *driver) driver_list = g_slist_remove(driver_list, driver); } -static void provider_remove_all(gpointer key, gpointer value, +void connman_provider_set_driver(struct connman_provider *provider, + struct connman_provider_driver *driver) +{ + provider->driver = driver; +} + +static void provider_disconnect_all(gpointer key, gpointer value, gpointer user_data) { struct connman_provider *provider = value; - __connman_provider_remove(provider->identifier); + connman_provider_disconnect(provider); } static void provider_offline_mode(connman_bool_t enabled) @@ -1418,7 +595,8 @@ static void provider_offline_mode(connman_bool_t enabled) DBG("enabled %d", enabled); if (enabled == TRUE) - g_hash_table_foreach(provider_hash, provider_remove_all, NULL); + g_hash_table_foreach(provider_hash, provider_disconnect_all, + NULL); } -- cgit v1.2.3