*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 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
#include <config.h>
#endif
+#include <errno.h>
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include <gdbus.h>
+#include <gweb/gresolv.h>
#include "connman.h"
static GSList *driver_list = NULL;
struct connman_provider {
- struct connman_element element;
+ int refcount;
+ bool immutable;
struct connman_service *vpn_service;
+ int index;
char *identifier;
- char *name;
- char *type;
- char *dns;
- char *domain;
+ int family;
struct connman_provider_driver *driver;
void *driver_data;
};
void __connman_provider_append_properties(struct connman_provider *provider,
DBusMessageIter *iter)
{
- if (provider->name != NULL)
- connman_dbus_dict_append_basic(iter, "Name",
- DBUS_TYPE_STRING, &provider->name);
+ const char *host, *domain, *type;
- if (provider->type != NULL)
+ if (!provider->driver || !provider->driver->get_property)
+ return;
+
+ host = provider->driver->get_property(provider, "Host");
+ domain = provider->driver->get_property(provider, "Domain");
+ type = provider->driver->get_property(provider, "Type");
+
+ if (host)
+ connman_dbus_dict_append_basic(iter, "Host",
+ DBUS_TYPE_STRING, &host);
+
+ if (domain)
+ connman_dbus_dict_append_basic(iter, "Domain",
+ DBUS_TYPE_STRING, &domain);
+
+ if (type)
connman_dbus_dict_append_basic(iter, "Type", DBUS_TYPE_STRING,
- &provider->type);
+ &type);
}
-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 int connman_provider_setup_vpn_ipv4(struct connman_provider *provider,
- struct connman_element *element)
+static void provider_remove(struct connman_provider *provider)
{
- if (element == NULL || provider == NULL)
- return -EINVAL;
-
- DBG("set vpn type %d", element->type);
-
- g_free(element->ipv4.address);
- element->ipv4.address = g_strdup(provider->element.ipv4.address);
-
- g_free(element->ipv4.netmask);
- element->ipv4.netmask = g_strdup(provider->element.ipv4.netmask);
-
- g_free(element->ipv4.gateway);
- element->ipv4.gateway = g_strdup(provider->element.ipv4.gateway);
-
- g_free(element->ipv4.broadcast);
- element->ipv4.broadcast = g_strdup(provider->element.ipv4.broadcast);
-
- g_free(element->ipv4.pac);
- element->ipv4.pac = g_strdup(provider->element.ipv4.pac);
-
- return connman_element_register(element, &provider->element);
+ if (provider->driver) {
+ provider->driver->remove(provider);
+ provider->driver = NULL;
+ }
}
-struct connman_provider *connman_provider_ref(struct connman_provider *provider)
+static void provider_destruct(struct connman_provider *provider)
{
DBG("provider %p", provider);
- if (connman_element_ref(&provider->element) == NULL)
- return NULL;
-
- return provider;
+ g_free(provider->identifier);
+ g_free(provider);
}
-void connman_provider_unref(struct connman_provider *provider)
+void connman_provider_unref_debug(struct connman_provider *provider,
+ const char *file, int line, const char *caller)
{
- DBG("provider %p", provider);
+ DBG("%p ref %d by %s:%d:%s()", provider, provider->refcount - 1,
+ file, line, caller);
+
+ if (__sync_fetch_and_sub(&provider->refcount, 1) != 1)
+ return;
- connman_element_unref(&provider->element);
+ provider_destruct(provider);
}
-static gboolean match_driver(struct connman_provider *provider,
- struct connman_provider_driver *driver)
+static int provider_indicate_state(struct connman_provider *provider,
+ enum connman_service_state state)
{
- if (g_strcmp0(driver->name, provider->type) == 0)
- return TRUE;
+ DBG("state %d", state);
+
+ __connman_service_ipconfig_indicate_state(provider->vpn_service, state,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
- return FALSE;
+ return __connman_service_ipconfig_indicate_state(provider->vpn_service,
+ state, CONNMAN_IPCONFIG_TYPE_IPV6);
}
-static int provider_probe(struct connman_provider *provider)
+int connman_provider_disconnect(struct connman_provider *provider)
{
- GSList *list;
-
- DBG("provider %p name %s", provider, provider->name);
-
- if (provider->driver != NULL)
- return -EALREADY;
+ int err;
- for (list = driver_list; list; list = list->next) {
- struct connman_provider_driver *driver = list->data;
+ DBG("provider %p", provider);
- if (match_driver(provider, driver) == FALSE)
- continue;
+ if (provider->driver && provider->driver->disconnect)
+ err = provider->driver->disconnect(provider);
+ else
+ return -EOPNOTSUPP;
- DBG("driver %p name %s", driver, driver->name);
+ if (provider->vpn_service)
+ provider_indicate_state(provider,
+ CONNMAN_SERVICE_STATE_DISCONNECT);
- if (driver->probe != NULL && driver->probe(provider) == 0) {
- provider->driver = driver;
- break;
- }
- }
+ if (err < 0)
+ return err;
- if (provider->driver == NULL)
- return -ENODEV;
+ if (provider->vpn_service)
+ provider_indicate_state(provider,
+ CONNMAN_SERVICE_STATE_IDLE);
return 0;
}
-int __connman_provider_disconnect(struct connman_provider *provider)
+int connman_provider_remove(struct connman_provider *provider)
{
- int err;
+ DBG("Removing VPN %s", provider->identifier);
- DBG("provider %p", provider);
+ provider_remove(provider);
- if (provider->driver != NULL && provider->driver->disconnect != NULL)
- err = provider->driver->disconnect(provider);
- else
- return -EOPNOTSUPP;
+ connman_provider_set_state(provider, CONNMAN_PROVIDER_STATE_IDLE);
- __connman_service_indicate_state(provider->vpn_service,
- CONNMAN_SERVICE_STATE_DISCONNECT);
- if (err < 0) {
- if (err != -EINPROGRESS)
- return err;
-
- return -EINPROGRESS;
- }
+ g_hash_table_remove(provider_hash, provider->identifier);
return 0;
}
-int __connman_provider_connect(struct connman_provider *provider)
+int __connman_provider_connect(struct connman_provider *provider,
+ const char *dbus_sender)
{
int err;
DBG("provider %p", provider);
- g_free(provider->element.ipv4.address);
- g_free(provider->element.ipv4.netmask);
- g_free(provider->element.ipv4.gateway);
- g_free(provider->element.ipv4.broadcast);
- g_free(provider->element.ipv4.pac);
-
- provider->element.ipv4.address = NULL;
- provider->element.ipv4.netmask = NULL;
- provider->element.ipv4.gateway = NULL;
- provider->element.ipv4.broadcast = NULL;
- provider->element.ipv4.pac = NULL;
-
- if (provider->driver != NULL && provider->driver->connect != NULL)
- err = provider->driver->connect(provider);
+ if (provider->driver && provider->driver->connect)
+ err = provider->driver->connect(provider, dbus_sender);
else
return -EOPNOTSUPP;
- if (err < 0) {
- if (err != -EINPROGRESS)
- return err;
+ switch (err) {
+ case 0:
+ return 0;
- __connman_service_indicate_state(provider->vpn_service,
+ case -EINPROGRESS:
+ provider_indicate_state(provider,
CONNMAN_SERVICE_STATE_ASSOCIATION);
+ /* fall through */
+ /*
+ * Return EINPROGRESS also for when there is an existing pending call.
+ * The state should not be indicated again but the real state is
+ * still in progress for the provider.
+ */
+ case -EALREADY:
return -EINPROGRESS;
}
- return 0;
+ return err;
}
-int __connman_provider_remove(const char *path)
+int __connman_provider_remove_by_path(const char *path)
{
struct connman_provider *provider;
+ GHashTableIter iter;
+ gpointer value, key;
DBG("path %s", path);
- provider = g_hash_table_lookup(provider_hash, path);
- if (provider == NULL) {
- DBG("patch %s not found", path);
- return -ENXIO;
- }
+ g_hash_table_iter_init(&iter, provider_hash);
+ while (g_hash_table_iter_next(&iter, &key, &value)) {
+ const char *srv_path;
+ provider = value;
- g_hash_table_remove(provider_hash, path);
+ if (!provider->vpn_service)
+ continue;
- return 0;
-}
+ srv_path = __connman_service_get_path(provider->vpn_service);
-static int set_connected(struct connman_provider *provider,
- connman_bool_t connected)
-{
- struct connman_service *service = provider->vpn_service;
+ if (g_strcmp0(srv_path, path) == 0) {
+ DBG("Removing VPN %s", provider->identifier);
- if (service == NULL)
- return -ENODEV;
+ provider_remove(provider);
- if (connected == TRUE) {
- enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
- struct connman_element *element;
- char *nameservers = NULL, *name = NULL;
- const char *value;
+ connman_provider_set_state(provider,
+ CONNMAN_PROVIDER_STATE_IDLE);
- type = CONNMAN_ELEMENT_TYPE_IPV4;
+ g_hash_table_remove(provider_hash,
+ provider->identifier);
+ return 0;
+ }
+ }
- element = connman_element_create(NULL);
- if (element == NULL)
- return -ENOMEM;
+ return -ENXIO;
+}
- element->type = type;
- element->index = provider->element.index;
+static int set_connected(struct connman_provider *provider,
+ bool connected)
+{
+ struct connman_service *service = provider->vpn_service;
+ struct connman_ipconfig *ipconfig;
- __connman_service_set_domainname(service, provider->domain);
+ if (!service)
+ return -ENODEV;
- nameservers = g_strdup(provider->dns);
- value = nameservers;
- name = connman_inet_ifname(provider->element.index);
- while (value) {
- char *next = strchr(value, ' ');
- if (next)
- *(next++) = 0;
+ ipconfig = __connman_service_get_ipconfig(service, provider->family);
- __connman_service_append_nameserver(service, value);
- value = next;
+ if (connected) {
+ if (!ipconfig) {
+ provider_indicate_state(provider,
+ CONNMAN_SERVICE_STATE_FAILURE);
+ return -EIO;
}
- g_free(nameservers);
- g_free(name);
+ __connman_ipconfig_address_add(ipconfig);
+ __connman_ipconfig_gateway_add(ipconfig);
- if (connman_provider_setup_vpn_ipv4(provider, element) < 0) {
- connman_element_unref(element);
+ provider_indicate_state(provider,
+ CONNMAN_SERVICE_STATE_READY);
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_FAILURE);
- }
+ if (provider->driver && provider->driver->set_routes)
+ provider->driver->set_routes(provider,
+ CONNMAN_PROVIDER_ROUTE_ALL);
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_READY);
} else {
- connman_element_unregister_children(&provider->element);
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE);
+ if (ipconfig) {
+ provider_indicate_state(provider,
+ CONNMAN_SERVICE_STATE_DISCONNECT);
+ __connman_ipconfig_gateway_remove(ipconfig);
+ }
+
+ provider_indicate_state(provider,
+ CONNMAN_SERVICE_STATE_IDLE);
}
return 0;
int connman_provider_set_state(struct connman_provider *provider,
enum connman_provider_state state)
{
- if (provider == NULL || provider->vpn_service == NULL)
+ if (!provider || !provider->vpn_service)
return -EINVAL;
switch (state) {
case CONNMAN_PROVIDER_STATE_UNKNOWN:
return -EINVAL;
case CONNMAN_PROVIDER_STATE_IDLE:
- return set_connected(provider, FALSE);
+ return set_connected(provider, false);
case CONNMAN_PROVIDER_STATE_CONNECT:
- return __connman_service_indicate_state(provider->vpn_service,
+ return provider_indicate_state(provider,
CONNMAN_SERVICE_STATE_ASSOCIATION);
case CONNMAN_PROVIDER_STATE_READY:
- return set_connected(provider, TRUE);
+ return set_connected(provider, true);
case CONNMAN_PROVIDER_STATE_DISCONNECT:
- return __connman_service_indicate_state(provider->vpn_service,
+ return provider_indicate_state(provider,
CONNMAN_SERVICE_STATE_DISCONNECT);
case CONNMAN_PROVIDER_STATE_FAILURE:
- return __connman_service_indicate_state(provider->vpn_service,
+ return provider_indicate_state(provider,
CONNMAN_SERVICE_STATE_FAILURE);
}
return -EINVAL;
}
-static void provider_free(gpointer user_data)
-{
- struct connman_provider *provider = user_data;
-
- DBG("provider %p", provider);
+int connman_provider_indicate_error(struct connman_provider *provider,
+ enum connman_provider_error error)
+{
+ enum connman_service_error service_error;
+
+ switch (error) {
+ case CONNMAN_PROVIDER_ERROR_LOGIN_FAILED:
+ service_error = CONNMAN_SERVICE_ERROR_LOGIN_FAILED;
+ break;
+ case CONNMAN_PROVIDER_ERROR_AUTH_FAILED:
+ service_error = CONNMAN_SERVICE_ERROR_AUTH_FAILED;
+ break;
+ case CONNMAN_PROVIDER_ERROR_CONNECT_FAILED:
+ service_error = CONNMAN_SERVICE_ERROR_CONNECT_FAILED;
+ break;
+ default:
+ service_error = CONNMAN_SERVICE_ERROR_UNKNOWN;
+ break;
+ }
- g_free(provider->name);
- g_free(provider->type);
- g_free(provider->domain);
- g_free(provider->identifier);
- g_free(provider->dns);
- __connman_service_put(provider->vpn_service);
+ return __connman_service_indicate_error(provider->vpn_service,
+ service_error);
}
-static void unregister_provider(gpointer data)
+int connman_provider_create_service(struct connman_provider *provider)
{
- struct connman_provider *provider = data;
+ if (provider->vpn_service) {
+ bool connected;
- DBG("provider %p", provider);
+ connected = __connman_service_is_connected_state(
+ provider->vpn_service, CONNMAN_IPCONFIG_TYPE_IPV4);
+ if (connected)
+ return -EALREADY;
- __connman_provider_disconnect(provider);
+ connected = __connman_service_is_connected_state(
+ provider->vpn_service, CONNMAN_IPCONFIG_TYPE_IPV6);
+ if (connected)
+ return -EALREADY;
- connman_element_unregister(&provider->element);
- connman_provider_unref(provider);
-}
+ return 0;
+ }
-static void provider_destruct(struct connman_element *element)
-{
- struct connman_provider *provider = element->private;
+ provider->vpn_service =
+ __connman_service_create_from_provider(provider);
- DBG("provider %p", provider);
+ if (!provider->vpn_service) {
+ connman_warn("service creation failed for provider %s",
+ provider->identifier);
- provider_free(provider);
+ g_hash_table_remove(provider_hash, provider->identifier);
+ return -EOPNOTSUPP;
+ }
+
+ return 0;
}
-static void __connman_provider_initialize(struct connman_provider *provider)
+bool __connman_provider_is_immutable(struct connman_provider *provider)
+
{
- DBG("provider %p", provider);
+ if (provider)
+ return provider->immutable;
- __connman_element_initialize(&provider->element);
+ return false;
+}
- provider->element.private = provider;
- provider->element.destruct = provider_destruct;
+int connman_provider_set_immutable(struct connman_provider *provider,
+ bool immutable)
+{
+ if (!provider)
+ return -EINVAL;
- provider->element.ipv4.address = NULL;
- provider->element.ipv4.netmask = NULL;
- provider->element.ipv4.gateway = NULL;
- provider->element.ipv4.broadcast = NULL;
- provider->element.ipv4.pac = NULL;
+ provider->immutable = immutable;
- provider->name = NULL;
- provider->type = NULL;
- provider->dns = NULL;
- provider->domain = NULL;
- provider->identifier = NULL;
+ return 0;
}
-static struct connman_provider *connman_provider_new(void)
+static struct connman_provider *provider_lookup(const char *identifier)
{
- struct connman_provider *provider;
+ return g_hash_table_lookup(provider_hash, identifier);
+}
- provider = g_try_new0(struct connman_provider, 1);
- if (provider == NULL)
- return NULL;
+static void connection_ready(DBusMessage *msg, int error_code, void *user_data)
+{
+ DBusMessage *reply;
+ const char *identifier = user_data;
- DBG("provider %p", provider);
- __connman_provider_initialize(provider);
+ DBG("msg %p error %d", msg, error_code);
- return provider;
-}
+ if (error_code != 0) {
+ reply = __connman_error_failed(msg, -error_code);
+ if (!g_dbus_send_message(connection, reply))
+ DBG("reply %p send failed", reply);
+ } else {
+ const char *path;
+ struct connman_provider *provider;
+
+ provider = provider_lookup(identifier);
+ if (!provider) {
+ reply = __connman_error_failed(msg, EINVAL);
+ g_dbus_send_message(connection, reply);
+ return;
+ }
-static int provider_register(struct connman_provider *provider)
-{
- DBG("provider %p", provider);
+ path = __connman_service_get_path(provider->vpn_service);
- return 0;
+ g_dbus_send_reply(connection, msg,
+ DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID);
+ }
}
-static struct connman_provider *connman_provider_get(const char *identifier)
+int __connman_provider_create_and_connect(DBusMessage *msg)
{
- struct connman_provider *provider;
+ struct connman_provider_driver *driver;
- provider = g_hash_table_lookup(provider_hash, identifier);
- if (provider != NULL)
- return provider;
+ if (!driver_list)
+ return -EINVAL;
+
+ driver = driver_list->data;
+ if (!driver || !driver->create)
+ return -EINVAL;
+
+ DBG("msg %p", msg);
- provider = connman_provider_new();
- if (provider == NULL)
+ return driver->create(msg, connection_ready);
+}
+
+const char *__connman_provider_get_ident(struct connman_provider *provider)
+{
+ if (!provider)
return NULL;
- DBG("provider %p", provider);
+ return provider->identifier;
+}
- provider->identifier = g_strdup(identifier);
+int connman_provider_set_string(struct connman_provider *provider,
+ const char *key, const char *value)
+{
+ if (provider->driver && provider->driver->set_property)
+ return provider->driver->set_property(provider, key, value);
- g_hash_table_insert(provider_hash, provider->identifier, provider);
+ return 0;
+}
- provider->element.name = g_strdup(identifier);
- connman_element_register(&provider->element, NULL);
+const char *connman_provider_get_string(struct connman_provider *provider,
+ const char *key)
+{
+ if (provider->driver && provider->driver->get_property)
+ return provider->driver->get_property(provider, key);
- return provider;
+ return NULL;
}
-static struct connman_provider *connman_provider_create(const char *name)
+bool
+__connman_provider_check_routes(struct connman_provider *provider)
{
- struct connman_provider *provider;
+ if (!provider)
+ return false;
- provider = connman_provider_get(name);
+ if (provider->driver && provider->driver->check_routes)
+ return provider->driver->check_routes(provider);
- if (provider == NULL)
- return NULL;
+ return false;
+}
- provider_register(provider);
+void *connman_provider_get_data(struct connman_provider *provider)
+{
+ return provider->driver_data;
+}
- return provider;
+void connman_provider_set_data(struct connman_provider *provider, void *data)
+{
+ provider->driver_data = data;
}
-int __connman_provider_create_and_connect(DBusMessage *msg)
+void connman_provider_set_index(struct connman_provider *provider, int index)
{
- struct connman_provider *provider;
- DBusMessageIter iter, array;
- const char *type = NULL, *name = NULL, *service_path = NULL;
- char *ident;
- gboolean created = FALSE;
- int err;
+ struct connman_service *service = provider->vpn_service;
+ struct connman_ipconfig *ipconfig;
- dbus_message_iter_init(msg, &iter);
- dbus_message_iter_recurse(&iter, &array);
+ DBG("");
- while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
+ if (!service)
+ return;
- dbus_message_iter_recurse(&array, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ ipconfig = __connman_service_get_ip4config(service);
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ if (!ipconfig) {
+ connman_service_create_ip4config(service, index);
- 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);
- break;
+ ipconfig = __connman_service_get_ip4config(service);
+ if (!ipconfig) {
+ DBG("Couldn't create ipconfig");
+ goto done;
}
+ }
- if (type != NULL && name != NULL)
- break;
+ __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_OFF);
+ __connman_ipconfig_set_index(ipconfig, index);
- dbus_message_iter_next(&array);
- }
+ ipconfig = __connman_service_get_ip6config(service);
- DBG("Type %s name %s", type, name);
+ if (!ipconfig) {
+ connman_service_create_ip6config(service, index);
- if (type == NULL || name == NULL) {
- err = -EOPNOTSUPP;
- goto failed;
+ ipconfig = __connman_service_get_ip6config(service);
+ if (!ipconfig) {
+ DBG("Couldn't create ipconfig for IPv6");
+ goto done;
+ }
}
- ident = g_strdup_printf("%s_%s", type, name);
+ __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_OFF);
+ __connman_ipconfig_set_index(ipconfig, index);
- provider = connman_provider_lookup(ident);
+done:
+ provider->index = index;
+}
- if (provider == NULL) {
- created = TRUE;
- provider = connman_provider_create(ident);
- if (provider) {
- provider->name = g_strdup(name);
- provider->type = g_strdup(type);
- }
- }
+int connman_provider_get_index(struct connman_provider *provider)
+{
+ return provider->index;
+}
- if (provider == NULL) {
- DBG("can not create provider");
- err = -EOPNOTSUPP;
- goto failed;
- }
- dbus_message_iter_init(msg, &iter);
- dbus_message_iter_recurse(&iter, &array);
+int connman_provider_set_ipaddress(struct connman_provider *provider,
+ struct connman_ipaddress *ipaddress)
+{
+ struct connman_ipconfig *ipconfig = NULL;
- while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key, *str;
+ ipconfig = __connman_service_get_ipconfig(provider->vpn_service,
+ ipaddress->family);
+ if (!ipconfig)
+ return -EINVAL;
- dbus_message_iter_recurse(&array, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ provider->family = ipaddress->family;
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_FIXED);
- 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;
- }
+ __connman_ipconfig_set_local(ipconfig, ipaddress->local);
+ __connman_ipconfig_set_peer(ipconfig, ipaddress->peer);
+ __connman_ipconfig_set_broadcast(ipconfig, ipaddress->broadcast);
+ __connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
+ __connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
- dbus_message_iter_next(&array);
- }
+ return 0;
+}
- g_free(ident);
+int connman_provider_set_pac(struct connman_provider *provider, const char *pac)
+{
+ DBG("provider %p pac %s", provider, pac);
- if (provider == NULL) {
- err = -EOPNOTSUPP;
- goto failed;
- }
+ __connman_service_set_pac(provider->vpn_service, pac);
- if (created == TRUE)
- provider_probe(provider);
+ return 0;
+}
- provider->vpn_service =
- __connman_service_create_from_provider(provider);
- if (provider->vpn_service == NULL) {
- err = -EOPNOTSUPP;
- goto failed;
- }
- err = __connman_service_connect(provider->vpn_service);
- if (err < 0 && err != -EINPROGRESS)
- goto failed;
+int connman_provider_set_domain(struct connman_provider *provider,
+ const char *domain)
+{
+ DBG("provider %p domain %s", provider, domain);
+
+ __connman_service_set_domainname(provider->vpn_service, domain);
- 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:
- if (provider != NULL && created == TRUE) {
- DBG("can not connect delete provider");
- connman_provider_unref(provider);
+int connman_provider_set_nameservers(struct connman_provider *provider,
+ char * const *nameservers)
+{
+ int i;
- if (provider->vpn_service != NULL)
- __connman_service_put(provider->vpn_service);
- }
+ DBG("provider %p nameservers %p", provider, nameservers);
- return err;
+ __connman_service_nameserver_clear(provider->vpn_service);
+
+ if (!nameservers)
+ return 0;
+
+ for (i = 0; nameservers[i]; i++)
+ __connman_service_nameserver_append(provider->vpn_service,
+ nameservers[i], false);
+
+ return 0;
}
-const char * __connman_provider_get_ident(struct connman_provider *provider)
+void connman_provider_set_autoconnect(struct connman_provider *provider,
+ bool flag)
{
- if (provider == NULL)
- return NULL;
+ if (!provider || !provider->vpn_service)
+ return;
- return provider->identifier;
+ /* Save VPN service if autoconnect value changes */
+ if (connman_service_set_autoconnect(provider->vpn_service, flag))
+ __connman_service_save(provider->vpn_service);
}
-int connman_provider_set_string(struct connman_provider *provider,
- const char *key, const char *value)
+static void unregister_provider(gpointer data)
{
- 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, "Gateway") == TRUE) {
- g_free(provider->element.ipv4.gateway);
- provider->element.ipv4.gateway = g_strdup(value);
- } else if (g_str_equal(key, "Address") == TRUE) {
- g_free(provider->element.ipv4.address);
- provider->element.ipv4.address = g_strdup(value);
- } else if (g_str_equal(key, "Netmask") == TRUE) {
- g_free(provider->element.ipv4.netmask);
- provider->element.ipv4.netmask = g_strdup(value);
- } else if (g_str_equal(key, "PAC") == TRUE) {
- g_free(provider->element.ipv4.pac);
- provider->element.ipv4.pac = g_strdup(value);
- } else if (g_str_equal(key, "DNS") == TRUE) {
- g_free(provider->dns);
- provider->dns = g_strdup(value);
- } else if (g_str_equal(key, "Domain") == TRUE) {
- g_free(provider->domain);
- provider->domain = g_strdup(value);
+ struct connman_provider *provider = data;
+
+ DBG("provider %p service %p", provider, provider->vpn_service);
+
+ if (provider->vpn_service) {
+ connman_service_unref(provider->vpn_service);
+ provider->vpn_service = NULL;
}
- return connman_element_set_string(&provider->element, key, value);
+ connman_provider_unref(provider);
}
-const char *connman_provider_get_string(struct connman_provider *provider,
- const char *key)
+static gint compare_priority(gconstpointer a, gconstpointer b)
{
- DBG("provider %p key %s", provider, key);
+ return 0;
+}
- if (g_str_equal(key, "Type") == TRUE)
- return provider->type;
- else if (g_str_equal(key, "Name") == TRUE)
- return provider->name;
+int connman_provider_driver_register(struct connman_provider_driver *driver)
+{
+ DBG("driver %p name %s", driver, driver->name);
- return connman_element_get_string(&provider->element, key);
+ driver_list = g_slist_insert_sorted(driver_list, driver,
+ compare_priority);
+ return 0;
}
-void *connman_provider_get_data(struct connman_provider *provider)
+void connman_provider_driver_unregister(struct connman_provider_driver *driver)
{
- return provider->driver_data;
+ DBG("driver %p name %s", driver, driver->name);
+
+ driver_list = g_slist_remove(driver_list, driver);
}
-void connman_provider_set_data(struct connman_provider *provider, void *data)
+void connman_provider_set_driver(struct connman_provider *provider,
+ struct connman_provider_driver *driver)
{
- provider->driver_data = data;
+ provider->driver = driver;
}
-void connman_provider_set_index(struct connman_provider *provider, int index)
+static void provider_disconnect_all(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct connman_provider *provider = value;
+
+ connman_provider_disconnect(provider);
+}
+
+static void provider_offline_mode(bool enabled)
{
- provider->element.index = index;
+ DBG("enabled %d", enabled);
+
+ if (enabled)
+ g_hash_table_foreach(provider_hash, provider_disconnect_all,
+ NULL);
+
}
-int connman_provider_get_index(struct connman_provider *provider)
+static void provider_initialize(struct connman_provider *provider)
{
- return provider->element.index;
+ DBG("provider %p", provider);
+
+ provider->index = 0;
+ provider->identifier = NULL;
}
-static gint compare_priority(gconstpointer a, gconstpointer b)
+static struct connman_provider *provider_new(void)
{
- return 0;
+ struct connman_provider *provider;
+
+ provider = g_try_new0(struct connman_provider, 1);
+ if (!provider)
+ return NULL;
+
+ provider->refcount = 1;
+
+ DBG("provider %p", provider);
+ provider_initialize(provider);
+
+ return provider;
}
-static void clean_provider(gpointer key, gpointer value, gpointer user_data)
+struct connman_provider *connman_provider_get(const char *identifier)
{
- struct connman_provider *provider = value;
+ struct connman_provider *provider;
- if (provider->driver != NULL && provider->driver->remove)
- provider->driver->remove(provider);
+ provider = g_hash_table_lookup(provider_hash, identifier);
+ if (provider)
+ return provider;
+
+ provider = provider_new();
+ if (!provider)
+ return NULL;
+
+ DBG("provider %p", provider);
+
+ provider->identifier = g_strdup(identifier);
+
+ g_hash_table_insert(provider_hash, provider->identifier, provider);
+
+ return provider;
}
-int connman_provider_driver_register(struct connman_provider_driver *driver)
+void connman_provider_put(struct connman_provider *provider)
{
- DBG("driver %p name %s", driver, driver->name);
+ g_hash_table_remove(provider_hash, provider->identifier);
+}
- driver_list = g_slist_insert_sorted(driver_list, driver,
- compare_priority);
- return 0;
+static struct connman_provider *provider_get(int index)
+{
+ GHashTableIter iter;
+ gpointer value, key;
+
+ g_hash_table_iter_init(&iter, provider_hash);
+
+ while (g_hash_table_iter_next(&iter, &key, &value)) {
+ struct connman_provider *provider = value;
+
+ if (provider->index == index)
+ return provider;
+ }
+
+ return NULL;
}
-void connman_provider_driver_unregister(struct connman_provider_driver *driver)
+static void provider_service_changed(struct connman_service *service,
+ enum connman_service_state state)
{
- DBG("driver %p name %s", driver, driver->name);
+ struct connman_provider *provider;
+ int vpn_index, service_index;
- driver_list = g_slist_remove(driver_list, driver);
+ if (!service)
+ return;
+
+ switch (state) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ case CONNMAN_SERVICE_STATE_READY:
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ return;
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ break;
+ }
+
+ service_index = __connman_service_get_index(service);
+
+ vpn_index = __connman_connection_get_vpn_index(service_index);
+
+ DBG("service %p %s state %d index %d/%d", service,
+ connman_service_get_identifier(service),
+ state, service_index, vpn_index);
+
+ if (vpn_index < 0)
+ return;
+
+ provider = provider_get(vpn_index);
+ if (!provider)
+ return;
+
+ DBG("disconnect %p index %d", provider, vpn_index);
+
+ connman_provider_disconnect(provider);
}
+static const struct connman_notifier provider_notifier = {
+ .name = "provider",
+ .offline_mode = provider_offline_mode,
+ .service_state_changed = provider_service_changed,
+};
+
int __connman_provider_init(void)
{
+ int err;
+
DBG("");
connection = connman_dbus_get_connection();
provider_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
NULL, unregister_provider);
- return 0;
+
+ err = connman_notifier_register(&provider_notifier);
+ if (err < 0) {
+ g_hash_table_destroy(provider_hash);
+ dbus_connection_unref(connection);
+ }
+
+ return err;
}
void __connman_provider_cleanup(void)
{
DBG("");
- g_hash_table_foreach(provider_hash, clean_provider, NULL);
+ connman_notifier_unregister(&provider_notifier);
g_hash_table_destroy(provider_hash);
provider_hash = NULL;
projects / platform / upstream / connman.git / blobdiff