*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2009 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
static DBusConnection *connection;
-static GStaticRWLock element_lock = G_STATIC_RW_LOCK_INIT;
static GNode *element_root = NULL;
-
static GSList *driver_list = NULL;
-
static gchar *device_filter = NULL;
-static struct {
- enum connman_property_id id;
- int type;
- const char *name;
- const void *value;
-} propid_table[] = {
- { CONNMAN_PROPERTY_ID_IPV4_METHOD,
- DBUS_TYPE_STRING, "IPv4.Method", "dhcp" },
- { CONNMAN_PROPERTY_ID_IPV4_ADDRESS,
- DBUS_TYPE_STRING, "IPv4.Address" },
- { CONNMAN_PROPERTY_ID_IPV4_NETMASK,
- DBUS_TYPE_STRING, "IPv4.Netmask" },
- { CONNMAN_PROPERTY_ID_IPV4_GATEWAY,
- DBUS_TYPE_STRING, "IPv4.Gateway" },
- { CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
- DBUS_TYPE_STRING, "IPv4.Nameserver" },
-
- { CONNMAN_PROPERTY_ID_WIFI_SECURITY,
- DBUS_TYPE_STRING, "WiFi.Security" },
- { CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE,
- DBUS_TYPE_STRING, "WiFi.Passphrase" },
-
- { }
-};
-
-static int propid2type(enum connman_property_id id)
-{
- int i;
-
- for (i = 0; propid_table[i].name; i++) {
- if (propid_table[i].id == id)
- return propid_table[i].type;
- }
-
- return DBUS_TYPE_INVALID;
-}
-
-static const char *propid2name(enum connman_property_id id)
-{
- int i;
-
- for (i = 0; propid_table[i].name; i++) {
- if (propid_table[i].id == id)
- return propid_table[i].name;
- }
-
- return NULL;
-}
+static gboolean started = FALSE;
static const char *type2string(enum connman_element_type type)
{
return "network";
case CONNMAN_ELEMENT_TYPE_SERVICE:
return "service";
+ case CONNMAN_ELEMENT_TYPE_PPP:
+ return "ppp";
case CONNMAN_ELEMENT_TYPE_IPV4:
return "ipv4";
case CONNMAN_ELEMENT_TYPE_IPV6:
return "bootp";
case CONNMAN_ELEMENT_TYPE_ZEROCONF:
return "zeroconf";
- case CONNMAN_ELEMENT_TYPE_RESOLVER:
- return "resolver";
case CONNMAN_ELEMENT_TYPE_CONNECTION:
return "connection";
+ case CONNMAN_ELEMENT_TYPE_VENDOR:
+ return "vendor";
}
return NULL;
}
-static const char *subtype2string(enum connman_element_subtype type)
-{
- switch (type) {
- case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
- return "unknown";
- case CONNMAN_ELEMENT_SUBTYPE_FAKE:
- return "fake";
- case CONNMAN_ELEMENT_SUBTYPE_NETWORK:
- return "network";
- case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
- return "ethernet";
- case CONNMAN_ELEMENT_SUBTYPE_WIFI:
- return "wifi";
- case CONNMAN_ELEMENT_SUBTYPE_WIMAX:
- return "wimax";
- case CONNMAN_ELEMENT_SUBTYPE_MODEM:
- return "modem";
- case CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH:
- return "bluetooth";
- }
-
- return NULL;
-}
-
-const char *__connman_element_policy2string(enum connman_element_policy policy)
+const char *__connman_ipv4_method2string(enum connman_ipv4_method method)
{
- switch (policy) {
- case CONNMAN_ELEMENT_POLICY_UNKNOWN:
+ switch (method) {
+ case CONNMAN_IPV4_METHOD_UNKNOWN:
return "unknown";
- case CONNMAN_ELEMENT_POLICY_OFF:
+ case CONNMAN_IPV4_METHOD_OFF:
return "off";
- case CONNMAN_ELEMENT_POLICY_AUTO:
- return "auto";
- case CONNMAN_ELEMENT_POLICY_IGNORE:
- return "ignore";
- case CONNMAN_ELEMENT_POLICY_ASK:
- return "ask";
+ case CONNMAN_IPV4_METHOD_STATIC:
+ return "static";
+ case CONNMAN_IPV4_METHOD_DHCP:
+ return "dhcp";
}
- return NULL;
+ return "unknown";
}
-enum connman_element_policy __connman_element_string2policy(const char *policy)
+enum connman_ipv4_method __connman_ipv4_string2method(const char *method)
{
- if (strcasecmp(policy, "off") == 0)
- return CONNMAN_ELEMENT_POLICY_OFF;
- else if (strcasecmp(policy, "ignore") == 0)
- return CONNMAN_ELEMENT_POLICY_IGNORE;
- else if (strcasecmp(policy, "auto") == 0)
- return CONNMAN_ELEMENT_POLICY_AUTO;
- else if (strcasecmp(policy, "ask") == 0)
- return CONNMAN_ELEMENT_POLICY_ASK;
+ if (strcasecmp(method, "off") == 0)
+ return CONNMAN_IPV4_METHOD_OFF;
+ else if (strcasecmp(method, "static") == 0)
+ return CONNMAN_IPV4_METHOD_STATIC;
+ else if (strcasecmp(method, "dhcp") == 0)
+ return CONNMAN_IPV4_METHOD_DHCP;
else
- return CONNMAN_ELEMENT_POLICY_UNKNOWN;
-}
-
-static void append_property(DBusMessageIter *dict,
- struct connman_property *property)
-{
- if (property->value == NULL)
- return;
-
- switch (property->type) {
- case DBUS_TYPE_ARRAY:
- connman_dbus_dict_append_array(dict, property->name,
- property->subtype, &property->value, property->size);
- break;
- case DBUS_TYPE_STRING:
- connman_dbus_dict_append_variant(dict, property->name,
- property->type, &property->value);
- break;
- default:
- connman_dbus_dict_append_variant(dict, property->name,
- property->type, property->value);
- break;
- }
+ return CONNMAN_IPV4_METHOD_UNKNOWN;
}
-static void add_common_properties(struct connman_element *element,
- DBusMessageIter *dict)
+static void emit_element_signal(DBusConnection *conn, const char *member,
+ struct connman_element *element)
{
- const char *address = NULL, *netmask = NULL, *gateway = NULL;
- GSList *list;
-
- connman_element_get_value(element,
- CONNMAN_PROPERTY_ID_IPV4_ADDRESS, &address);
- connman_element_get_value(element,
- CONNMAN_PROPERTY_ID_IPV4_NETMASK, &netmask);
- connman_element_get_value(element,
- CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
-
- if (element->priority > 0)
- connman_dbus_dict_append_variant(dict, "Priority",
- DBUS_TYPE_UINT16, &element->priority);
-
- if (address != NULL)
- connman_dbus_dict_append_variant(dict, "IPv4.Address",
- DBUS_TYPE_STRING, &address);
- if (netmask != NULL)
- connman_dbus_dict_append_variant(dict, "IPv4.Netmask",
- DBUS_TYPE_STRING, &netmask);
- if (gateway != NULL)
- connman_dbus_dict_append_variant(dict, "IPv4.Gateway",
- DBUS_TYPE_STRING, &gateway);
-
- if (element->wifi.security != NULL) {
- const char *passphrase = "";
-
- connman_dbus_dict_append_variant(dict, "WiFi.Security",
- DBUS_TYPE_STRING, &element->wifi.security);
-
- if (element->wifi.passphrase != NULL)
- passphrase = element->wifi.passphrase;
-
- connman_dbus_dict_append_variant(dict, "WiFi.Passphrase",
- DBUS_TYPE_STRING, &passphrase);
- }
-
- __connman_element_lock(element);
-
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- append_property(dict, property);
- }
-
- __connman_element_unlock(element);
-}
-
-static void set_common_property(struct connman_element *element,
- const char *name, DBusMessageIter *value)
-{
- GSList *list;
+ DBusMessage *signal;
- if (g_str_equal(name, "Priority") == TRUE) {
- dbus_message_iter_get_basic(value, &element->priority);
+ if (__connman_debug_enabled() == FALSE)
return;
- }
- __connman_element_lock(element);
-
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
- const char *str;
-
- if (g_str_equal(property->name, name) == FALSE)
- continue;
-
- if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
- continue;
-
- property->flags &= ~CONNMAN_PROPERTY_FLAG_REFERENCE;
-
- if (property->type == DBUS_TYPE_STRING) {
- dbus_message_iter_get_basic(value, &str);
- g_free(property->value);
- property->value = g_strdup(str);
- } else
- property->value = NULL;
- }
-
- __connman_element_unlock(element);
-}
-
-static DBusMessage *do_update(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
-
- DBG("conn %p", conn);
-
- if (element->enabled == FALSE)
- return __connman_error_failed(msg);
-
- if (element->driver && element->driver->update) {
- DBG("Calling update callback");
- if (element->driver->update(element) < 0)
- return __connman_error_failed(msg);
+ DBG("conn %p member %s", conn, member);
- }
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *do_enable(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
-
- DBG("conn %p", conn);
-
- if (element->enabled == TRUE)
- return __connman_error_failed(msg);
-
- if (element->driver && element->driver->enable) {
- DBG("Calling enable callback");
- if (element->driver->enable(element) < 0)
- return __connman_error_failed(msg);
- }
-
- element->enabled = TRUE;
-
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *do_disable(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
-
- DBG("conn %p", conn);
-
- if (element->enabled == FALSE)
- return __connman_error_failed(msg);
-
- if (element->driver && element->driver->disable) {
- DBG("Calling disable callback");
- if (element->driver->disable(element) < 0)
- return __connman_error_failed(msg);
- }
-
- element->enabled = FALSE;
-
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static void append_networks(struct connman_element *element,
- DBusMessageIter *dict)
-{
- DBusMessageIter entry, value, iter;
- const char *key = "Networks";
-
- if (element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIFI &&
- element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIMAX)
+ if (element == NULL)
return;
- dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
-
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
- &value);
-
- dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
- __connman_element_list(element, CONNMAN_ELEMENT_TYPE_NETWORK, &iter);
-
- dbus_message_iter_close_container(&value, &iter);
-
- dbus_message_iter_close_container(&entry, &value);
-
- dbus_message_iter_close_container(dict, &entry);
-}
-
-static DBusMessage *device_get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *str;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
- DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
-
- str = subtype2string(element->subtype);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Type",
- DBUS_TYPE_STRING, &str);
-
- str = __connman_element_policy2string(element->policy);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Policy",
- DBUS_TYPE_STRING, &str);
-
- connman_dbus_dict_append_variant(&dict, "Powered",
- DBUS_TYPE_BOOLEAN, &element->enabled);
-
- append_networks(element, &dict);
-
- add_common_properties(element, &dict);
-
- dbus_message_iter_close_container(&array, &dict);
-
- return reply;
-}
-
-static DBusMessage *device_set_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessageIter iter, value;
- const char *name;
-
- DBG("conn %p", conn);
-
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_get_basic(&iter, &name);
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
-
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
-
- if (g_str_equal(name, "Powered") == TRUE) {
- dbus_bool_t powered;
-
- dbus_message_iter_get_basic(&value, &powered);
-
- if (powered == TRUE)
- do_enable(conn, msg, data);
- else
- do_disable(conn, msg, data);
- } else
- set_common_property(element, name, &value);
-
- __connman_element_store(element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static int parse_network_dict(DBusMessageIter *iter, const char **ssid,
- const char **security, const char **passphrase)
-{
- while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
-
- dbus_message_iter_recurse(iter, &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, "WiFi.SSID") == TRUE)
- dbus_message_iter_get_basic(&value, ssid);
- else if (g_str_equal(key, "WiFi.Security") == TRUE)
- dbus_message_iter_get_basic(&value, security);
- else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
- dbus_message_iter_get_basic(&value, passphrase);
- break;
- }
-
- dbus_message_iter_next(iter);
- }
-
- return 0;
-}
-
-static DBusMessage *device_create_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- struct connman_element *network;
- DBusMessageIter iter, array;
- const char *ssid = NULL, *security = NULL, *passphrase = NULL;
-
- DBG("conn %p", conn);
-
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_recurse(&iter, &array);
- parse_network_dict(&array, &ssid, &security, &passphrase);
- if (ssid == NULL)
- return __connman_error_invalid_arguments(msg);
-
- DBG("ssid %s security %s passphrase %s", ssid, security, passphrase);
-
- network = connman_element_create(ssid);
-
- network->type = CONNMAN_ELEMENT_TYPE_NETWORK;
- network->index = element->index;
-
- network->remember = TRUE;
-
- connman_element_add_static_property(network, "Name",
- DBUS_TYPE_STRING, &ssid);
-
- connman_element_add_static_array_property(element, "WiFi.SSID",
- DBUS_TYPE_BYTE, &ssid, strlen(ssid));
-
- network->wifi.security = g_strdup(security);
- network->wifi.passphrase = g_strdup(passphrase);
-
- connman_element_register(network, element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &network->path,
- DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *device_remove_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *network_get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *str;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
- DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
-
- str = __connman_element_policy2string(element->policy);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Policy",
- DBUS_TYPE_STRING, &str);
-
- connman_dbus_dict_append_variant(&dict, "Available",
- DBUS_TYPE_BOOLEAN, &element->available);
-
- connman_dbus_dict_append_variant(&dict, "Connected",
- DBUS_TYPE_BOOLEAN, &element->enabled);
-
- connman_dbus_dict_append_variant(&dict, "Remember",
- DBUS_TYPE_BOOLEAN, &element->remember);
-
- add_common_properties(element, &dict);
-
- dbus_message_iter_close_container(&array, &dict);
-
- return reply;
-}
-
-static DBusMessage *network_set_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessageIter iter;
- DBusMessageIter value;
- const char *name;
-
- DBG("conn %p", conn);
-
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_get_basic(&iter, &name);
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
-
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
-
- if (g_str_equal(name, "Remember") == TRUE) {
- dbus_message_iter_get_basic(&value, &element->remember);
- } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
- const char *str;
-
- dbus_message_iter_get_basic(&value, &str);
- g_free(element->wifi.passphrase);
- element->wifi.passphrase = g_strdup(str);
- } else
- set_common_property(element, name, &value);
-
- __connman_element_store(element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *get_connection_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
- DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
-
- add_common_properties(element, &dict);
-
- dbus_message_iter_close_container(&array, &dict);
+ signal = dbus_message_new_signal(element->path,
+ CONNMAN_DEBUG_INTERFACE, member);
+ if (signal == NULL)
+ return;
- return reply;
+ g_dbus_send_message(conn, signal);
}
-#if 0
-static DBusMessage *get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *str;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
- DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
-
- if (element->parent != NULL &&
- element->parent->type != CONNMAN_ELEMENT_TYPE_ROOT) {
- connman_dbus_dict_append_variant(&dict, "Parent",
- DBUS_TYPE_OBJECT_PATH, &element->parent->path);
- }
-
- str = type2string(element->type);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Type",
- DBUS_TYPE_STRING, &str);
- str = subtype2string(element->subtype);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Subtype",
- DBUS_TYPE_STRING, &str);
-
- connman_dbus_dict_append_variant(&dict, "Enabled",
- DBUS_TYPE_BOOLEAN, &element->enabled);
-
- add_common_properties(element, &dict);
-
- dbus_message_iter_close_container(&array, &dict);
-
- return reply;
-}
+struct foreach_data {
+ enum connman_element_type type;
+ element_cb_t callback;
+ gpointer user_data;
+};
-static DBusMessage *set_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static gboolean foreach_callback(GNode *node, gpointer user_data)
{
- struct connman_element *element = data;
- DBusMessageIter iter;
- DBusMessageIter value;
- const char *name;
-
- DBG("conn %p", conn);
+ struct connman_element *element = node->data;
+ struct foreach_data *data = user_data;
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
+ DBG("element %p name %s", element, element->name);
- dbus_message_iter_get_basic(&iter, &name);
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
+ if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
+ return FALSE;
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
+ if (data->type != CONNMAN_ELEMENT_TYPE_UNKNOWN &&
+ data->type != element->type)
+ return FALSE;
- set_common_property(element, name, &value);
+ if (data->callback)
+ data->callback(element, data->user_data);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ return FALSE;
}
-static DBusMessage *clear_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
+void __connman_element_foreach(struct connman_element *element,
+ enum connman_element_type type,
+ element_cb_t callback, gpointer user_data)
{
- struct connman_element *element = data;
- const char *name;
- GSList *list;
-
- DBG("conn %p", conn);
-
- if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
-
- __connman_element_lock(element);
-
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (g_str_equal(property->name, name) == FALSE)
- continue;
-
- if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
- continue;
-
- if (property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE)
- continue;
-
- property->flags |= CONNMAN_PROPERTY_FLAG_REFERENCE;
-
- if (property->type == DBUS_TYPE_STRING)
- g_free(property->value);
-
- property->value = NULL;
- }
-
- __connman_element_unlock(element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static GDBusMethodTable element_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
- { "ClearProperty", "s", "", clear_property },
- { "Update", "", "", do_update },
- { "Enable", "", "", do_enable },
- { "Disable", "", "", do_disable },
- { },
-};
-#endif
-
-static GDBusSignalTable element_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
+ struct foreach_data data = { type, callback, user_data };
+ GNode *node;
-static GDBusMethodTable device_methods[] = {
- { "GetProperties", "", "a{sv}", device_get_properties },
- { "SetProperty", "sv", "", device_set_property },
- { "CreateNetwork", "a{sv}", "o", device_create_network },
- { "RemoveNetwork", "o", "", device_remove_network },
- { "ProposeScan", "", "", do_update },
- { },
-};
+ DBG("");
-static GDBusMethodTable network_methods[] = {
- { "GetProperties", "", "a{sv}", network_get_properties },
- { "SetProperty", "sv", "", network_set_property },
- { "Connect", "", "", do_enable },
- { "Disconnect", "", "", do_disable },
- { },
-};
+ if (element != NULL) {
+ node = g_node_find(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, element);
+ if (node == NULL)
+ return;
+ } else
+ node = element_root;
-static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", get_connection_properties },
- { },
-};
+ g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ foreach_callback, &data);
+}
struct append_filter {
enum connman_element_type type;
return FALSE;
if (filter->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
- element->subtype == CONNMAN_ELEMENT_SUBTYPE_NETWORK)
+ __connman_device_has_driver(element->device) == FALSE)
+ return FALSE;
+
+ if (filter->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
+ __connman_network_has_driver(element->network) == FALSE)
return FALSE;
dbus_message_iter_append_basic(filter->iter,
} else
node = element_root;
- g_static_rw_lock_reader_lock(&element_lock);
g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
append_path, &filter);
- g_static_rw_lock_reader_unlock(&element_lock);
}
struct count_data {
} else
node = element_root;
- g_static_rw_lock_reader_lock(&element_lock);
g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
count_element, &data);
- g_static_rw_lock_reader_unlock(&element_lock);
return data.count;
}
+static struct connman_network *__connman_element_get_network(struct connman_element *element)
+{
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
+ element->network != NULL)
+ return element->network;
+
+ if (element->parent == NULL)
+ return NULL;
+
+ return __connman_element_get_network(element->parent);
+}
+
+struct connman_service *__connman_element_get_service(struct connman_element *element)
+{
+ struct connman_service *service = NULL;
+ struct connman_network *network;
+ struct connman_device *device;
+ enum connman_device_type type;
+
+ device = __connman_element_get_device(element);
+ if (device == NULL)
+ return NULL;
+
+ type = connman_device_get_type(device);
+
+ switch (type) {
+ case CONNMAN_DEVICE_TYPE_UNKNOWN:
+ case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ case CONNMAN_DEVICE_TYPE_GPS:
+ case CONNMAN_DEVICE_TYPE_HSO:
+ case CONNMAN_DEVICE_TYPE_NOZOMI:
+ case CONNMAN_DEVICE_TYPE_HUAWEI:
+ case CONNMAN_DEVICE_TYPE_NOVATEL:
+ break;
+ case CONNMAN_DEVICE_TYPE_ETHERNET:
+ service = __connman_service_lookup_from_device(device);
+ break;
+ case CONNMAN_DEVICE_TYPE_WIFI:
+ case CONNMAN_DEVICE_TYPE_WIMAX:
+ network = __connman_element_get_network(element);
+ if (network == NULL)
+ return NULL;
+ service = __connman_service_lookup_from_network(network);
+ break;
+ }
+
+ return service;
+}
+
+struct connman_device *__connman_element_get_device(struct connman_element *element)
+{
+ if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
+ element->device != NULL)
+ return element->device;
+
+ if (element->parent == NULL)
+ return NULL;
+
+ return __connman_element_get_device(element->parent);
+}
+
+const char *__connman_element_get_device_path(struct connman_element *element)
+{
+ struct connman_device *device;
+
+ device = __connman_element_get_device(element);
+ if (device == NULL)
+ return NULL;
+
+ return connman_device_get_path(device);
+}
+
+const char *__connman_element_get_network_path(struct connman_element *element)
+{
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
+ element->network != NULL)
+ return element->path;
+
+ if (element->parent == NULL)
+ return NULL;
+
+ return __connman_element_get_network_path(element->parent);
+}
+
static gint compare_priority(gconstpointer a, gconstpointer b)
{
const struct connman_driver *driver1 = a;
if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
return FALSE;
- if (element->type != driver->type &&
- driver->type != CONNMAN_ELEMENT_TYPE_UNKNOWN)
- return FALSE;
-
- if (element->subtype == driver->subtype ||
- driver->subtype == CONNMAN_ELEMENT_SUBTYPE_UNKNOWN)
+ if (element->type == driver->type ||
+ driver->type == CONNMAN_ELEMENT_TYPE_UNKNOWN)
return TRUE;
return FALSE;
}
-static void enable_element(struct connman_element *element)
-{
- if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
- return;
-
- if (element->policy != CONNMAN_ELEMENT_POLICY_AUTO)
- return;
-
- if (element->driver && element->driver->enable) {
- if (element->driver->enable(element) == 0)
- element->enabled = TRUE;
- }
-}
-
static gboolean probe_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
__connman_element_lock(element);
element->driver = driver;
__connman_element_unlock(element);
-
- enable_element(element);
}
return FALSE;
if (!driver->probe)
return;
- g_static_rw_lock_writer_lock(&element_lock);
-
if (element_root != NULL)
g_node_traverse(element_root, G_PRE_ORDER,
G_TRAVERSE_ALL, -1, probe_driver, driver);
-
- g_static_rw_lock_writer_unlock(&element_lock);
}
/**
if (!driver->probe)
return -EINVAL;
- g_static_rw_lock_writer_lock(&element_lock);
-
driver_list = g_slist_insert_sorted(driver_list, driver,
compare_priority);
+ if (started == FALSE)
+ return 0;
+
if (element_root != NULL)
g_node_traverse(element_root, G_PRE_ORDER,
G_TRAVERSE_ALL, -1, probe_driver, driver);
- g_static_rw_lock_writer_unlock(&element_lock);
-
return 0;
}
-static void disable_element(struct connman_element *element)
-{
- if (element->policy != CONNMAN_ELEMENT_POLICY_AUTO)
- return;
-
- if (element->enabled == FALSE)
- return;
-
- if (element->driver && element->driver->disable) {
- if (element->driver->disable(element) == 0)
- element->enabled = FALSE;
- }
-}
-
static gboolean remove_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
DBG("element %p name %s", element, element->name);
if (element->driver == driver) {
- disable_element(element);
-
if (driver->remove)
driver->remove(element);
{
DBG("driver %p name %s", driver, driver->name);
- g_static_rw_lock_writer_lock(&element_lock);
-
driver_list = g_slist_remove(driver_list, driver);
if (element_root != NULL)
g_node_traverse(element_root, G_POST_ORDER,
G_TRAVERSE_ALL, -1, remove_driver, driver);
+}
+
+static void unregister_property(gpointer data)
+{
+ struct connman_property *property = data;
+
+ DBG("property %p", property);
+
+ g_free(property->value);
+ g_free(property);
+}
+
+void __connman_element_initialize(struct connman_element *element)
+{
+ DBG("element %p", element);
+
+ element->refcount = 1;
+
+ element->name = NULL;
+ element->type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
+ element->state = CONNMAN_ELEMENT_STATE_UNKNOWN;
+ element->error = CONNMAN_ELEMENT_ERROR_UNKNOWN;
+ element->index = -1;
+ element->enabled = FALSE;
+
+ element->configuring = FALSE;
- g_static_rw_lock_writer_unlock(&element_lock);
+ element->properties = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, unregister_property);
}
/**
DBG("element %p", element);
- element->refcount = 1;
-
- element->name = g_strdup(name);
- element->type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
- element->subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
- element->state = CONNMAN_ELEMENT_STATE_CLOSED;
- element->policy = CONNMAN_ELEMENT_POLICY_AUTO;
- element->index = -1;
- element->enabled = FALSE;
+ __connman_element_initialize(element);
return element;
}
static void free_properties(struct connman_element *element)
{
- GSList *list;
-
DBG("element %p name %s", element, element->name);
__connman_element_lock(element);
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (!(property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE))
- g_free(property->value);
-
- g_free(property->name);
- g_free(property);
- }
-
- g_slist_free(element->properties);
-
+ g_hash_table_destroy(element->properties);
element->properties = NULL;
__connman_element_unlock(element);
g_atomic_int_get(&element->refcount) - 1);
if (g_atomic_int_dec_and_test(&element->refcount) == TRUE) {
+ if (element->destruct)
+ element->destruct(element);
free_properties(element);
g_free(element->ipv4.address);
g_free(element->ipv4.netmask);
}
}
-int connman_element_add_static_property(struct connman_element *element,
+static int set_static_property(struct connman_element *element,
const char *name, int type, const void *value)
{
struct connman_property *property;
if (property == NULL)
return -ENOMEM;
- property->flags = CONNMAN_PROPERTY_FLAG_STATIC;
- property->id = CONNMAN_PROPERTY_ID_INVALID;
- property->name = g_strdup(name);
- property->type = type;
+ property->id = CONNMAN_PROPERTY_ID_INVALID;
+ property->type = type;
DBG("name %s type %d value %p", name, type, value);
}
__connman_element_lock(element);
- element->properties = g_slist_append(element->properties, property);
+
+ g_hash_table_replace(element->properties, g_strdup(name), property);
+
__connman_element_unlock(element);
return 0;
}
-int connman_element_add_static_array_property(struct connman_element *element,
+static int set_static_array_property(struct connman_element *element,
const char *name, int type, const void *value, int len)
{
struct connman_property *property;
if (property == NULL)
return -ENOMEM;
- property->flags = CONNMAN_PROPERTY_FLAG_STATIC;
property->id = CONNMAN_PROPERTY_ID_INVALID;
- property->name = g_strdup(name);
property->type = DBUS_TYPE_ARRAY;
property->subtype = type;
}
__connman_element_lock(element);
- element->properties = g_slist_append(element->properties, property);
- __connman_element_unlock(element);
-
- return 0;
-}
-
-static void *get_reference_value(struct connman_element *element,
- enum connman_property_id id)
-{
- GSList *list;
-
- DBG("element %p name %s", element, element->name);
-
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (property->id != id)
- continue;
-
- if (!(property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE))
- return property->value;
- }
-
- if (element->parent == NULL)
- return NULL;
-
- return get_reference_value(element->parent, id);
-}
-
-static void set_reference_properties(struct connman_element *element)
-{
- GSList *list;
-
- DBG("element %p name %s", element, element->name);
-
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (!(property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE))
- continue;
-
- property->value = get_reference_value(element->parent,
- property->id);
- }
-}
-
-static struct connman_property *create_property(struct connman_element *element,
- enum connman_property_id id)
-{
- struct connman_property *property;
- GSList *list;
-
- DBG("element %p name %s", element, element->name);
-
- __connman_element_lock(element);
-
- for (list = element->properties; list; list = list->next) {
- property = list->data;
-
- if (property->id == id)
- goto unlock;
- }
-
- property = g_try_new0(struct connman_property, 1);
- if (property == NULL)
- goto unlock;
-
- property->flags = CONNMAN_PROPERTY_FLAG_REFERENCE;
- property->id = id;
- property->name = g_strdup(propid2name(id));
- property->type = propid2type(id);
-
- if (property->name == NULL) {
- g_free(property);
- property = NULL;
- goto unlock;
- }
- element->properties = g_slist_append(element->properties, property);
+ g_hash_table_replace(element->properties, g_strdup(name), property);
-unlock:
__connman_element_unlock(element);
- return property;
-}
-
-static void create_default_properties(struct connman_element *element)
-{
- struct connman_property *property;
- int i;
-
- DBG("element %p name %s", element, element->name);
-
- for (i = 0; propid_table[i].name; i++) {
- DBG("property %s", propid_table[i].name);
-
- property = create_property(element, propid_table[i].id);
-
- property->flags &= ~CONNMAN_PROPERTY_FLAG_REFERENCE;
-
- if (propid_table[i].type != DBUS_TYPE_STRING)
- continue;
-
- if (propid_table[i].value)
- property->value = g_strdup(propid_table[i].value);
- else
- property->value = g_strdup("");
- }
-}
-
-static int define_properties_valist(struct connman_element *element,
- va_list args)
-{
- enum connman_property_id id;
-
- DBG("element %p name %s", element, element->name);
-
- id = va_arg(args, enum connman_property_id);
-
- while (id != CONNMAN_PROPERTY_ID_INVALID) {
-
- DBG("property %d", id);
-
- create_property(element, id);
-
- id = va_arg(args, enum connman_property_id);
- }
-
return 0;
}
-/**
- * connman_element_define_properties:
- * @element: an element
- * @varargs: list of property identifiers
- *
- * Define the valid properties for an element.
- *
- * Returns: %0 on success
- */
-int connman_element_define_properties(struct connman_element *element, ...)
-{
- va_list args;
- int err;
-
- DBG("element %p name %s", element, element->name);
-
- va_start(args, element);
-
- err = define_properties_valist(element, args);
-
- va_end(args);
-
- return err;
-}
-
-int connman_element_create_property(struct connman_element *element,
- const char *name, int type)
-{
- return -EIO;
-}
-
-int connman_element_set_property(struct connman_element *element,
+#if 0
+static int set_property(struct connman_element *element,
enum connman_property_id id, const void *value)
{
switch (id) {
element->ipv4.gateway = g_strdup(*((const char **) value));
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
- __connman_element_lock(element);
- g_free(element->ipv4.nameserver);
- element->ipv4.nameserver = g_strdup(*((const char **) value));
- __connman_element_unlock(element);
- break;
- case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
+ case CONNMAN_PROPERTY_ID_IPV4_BROADCAST:
__connman_element_lock(element);
- g_free(element->wifi.security);
- element->wifi.security = g_strdup(*((const char **) value));
+ g_free(element->ipv4.broadcast);
+ element->ipv4.broadcast = g_strdup(*((const char **) value));
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
+ case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
__connman_element_lock(element);
- g_free(element->wifi.passphrase);
- element->wifi.passphrase = g_strdup(*((const char **) value));
+ g_free(element->ipv4.nameserver);
+ element->ipv4.nameserver = g_strdup(*((const char **) value));
__connman_element_unlock(element);
break;
default:
return -EINVAL;
}
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
return 0;
}
+#endif
int connman_element_get_value(struct connman_element *element,
enum connman_property_id id, void *value)
return -EINVAL;
switch (id) {
+ case CONNMAN_PROPERTY_ID_IPV4_METHOD:
+ if (element->ipv4.method == CONNMAN_IPV4_METHOD_UNKNOWN)
+ return connman_element_get_value(element->parent,
+ id, value);
+ __connman_element_lock(element);
+ *((const char **) value) = __connman_ipv4_method2string(element->ipv4.method);
+ __connman_element_unlock(element);
+ break;
case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
if (element->ipv4.address == NULL)
return connman_element_get_value(element->parent,
*((char **) value) = element->ipv4.gateway;
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
- if (element->ipv4.nameserver == NULL)
- return connman_element_get_value(element->parent,
- id, value);
- __connman_element_lock(element);
- *((char **) value) = element->ipv4.nameserver;
- __connman_element_unlock(element);
- break;
- case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
- if (element->wifi.security == NULL)
+ case CONNMAN_PROPERTY_ID_IPV4_BROADCAST:
+ if (element->ipv4.broadcast == NULL)
return connman_element_get_value(element->parent,
id, value);
__connman_element_lock(element);
- *((char **) value) = element->wifi.security;
+ *((char **) value) = element->ipv4.broadcast;
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
- if (element->wifi.passphrase == NULL)
+ case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
+ if (element->ipv4.nameserver == NULL)
return connman_element_get_value(element->parent,
id, value);
__connman_element_lock(element);
- *((char **) value) = element->wifi.passphrase;
+ *((char **) value) = element->ipv4.nameserver;
__connman_element_unlock(element);
break;
default:
return 0;
}
-gboolean connman_element_get_static_property(struct connman_element *element,
+static gboolean get_static_property(struct connman_element *element,
const char *name, void *value)
{
- GSList *list;
+ struct connman_property *property;
gboolean found = FALSE;
DBG("element %p name %s", element, element->name);
__connman_element_lock(element);
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
- continue;
-
- if (g_str_equal(property->name, name) == TRUE) {
- switch (property->type) {
- case DBUS_TYPE_STRING:
- *((char **) value) = property->value;
- found = TRUE;
- break;
- }
+ property = g_hash_table_lookup(element->properties, name);
+ if (property != NULL) {
+ switch (property->type) {
+ case DBUS_TYPE_STRING:
+ *((char **) value) = property->value;
+ found = TRUE;
+ break;
+ case DBUS_TYPE_BYTE:
+ memcpy(value, property->value, 1);
+ found = TRUE;
break;
}
}
__connman_element_unlock(element);
+ if (found == FALSE && element->parent != NULL)
+ return get_static_property(element->parent, name, value);
+
return found;
}
-gboolean connman_element_get_static_array_property(struct connman_element *element,
- const char *name, void *value, int *len)
+static gboolean get_static_array_property(struct connman_element *element,
+ const char *name, void *value, unsigned int *len)
{
- GSList *list;
+ struct connman_property *property;
gboolean found = FALSE;
DBG("element %p name %s", element, element->name);
- __connman_element_lock(element);
-
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
- continue;
-
- if (g_str_equal(property->name, name) == TRUE) {
- *((char **) value) = property->value;
- *len = property->size;
- found = TRUE;
- break;
- }
+ __connman_element_lock(element);
+
+ property = g_hash_table_lookup(element->properties, name);
+ if (property != NULL) {
+ *((char **) value) = property->value;
+ *len = property->size;
+ found = TRUE;
}
__connman_element_unlock(element);
return found;
}
-gboolean connman_element_match_static_property(struct connman_element *element,
+#if 0
+static gboolean match_static_property(struct connman_element *element,
const char *name, const void *value)
{
- GSList *list;
+ struct connman_property *property;
gboolean result = FALSE;
DBG("element %p name %s", element, element->name);
__connman_element_lock(element);
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
- continue;
-
- if (g_str_equal(property->name, name) == FALSE)
- continue;
-
+ property = g_hash_table_lookup(element->properties, name);
+ if (property != NULL) {
if (property->type == DBUS_TYPE_STRING)
result = g_str_equal(property->value,
*((const char **) value));
-
- if (result == TRUE)
- break;
}
__connman_element_unlock(element);
return result;
}
+#endif
-static void append_devices(DBusMessageIter *entry)
+/**
+ * connman_element_set_string:
+ * @element: element structure
+ * @key: unique identifier
+ * @value: string value
+ *
+ * Set string value for specific key
+ */
+int connman_element_set_string(struct connman_element *element,
+ const char *key, const char *value)
{
- DBusMessageIter value, iter;
- const char *key = "Devices";
-
- dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
-
- dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
- &value);
+ return set_static_property(element, key, DBUS_TYPE_STRING, &value);
+}
- dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+/**
+ * connman_element_get_string:
+ * @element: element structure
+ * @key: unique identifier
+ *
+ * Get string value for specific key
+ */
+const char *connman_element_get_string(struct connman_element *element,
+ const char *key)
+{
+ const char *value;
- __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
+ if (get_static_property(element, key, &value) == FALSE)
+ return NULL;
- dbus_message_iter_close_container(&value, &iter);
+ return value;
+}
- dbus_message_iter_close_container(entry, &value);
+/**
+ * connman_element_set_uint8:
+ * @element: element structure
+ * @key: unique identifier
+ * @value: integer value
+ *
+ * Set integer value for specific key
+ */
+int connman_element_set_uint8(struct connman_element *element,
+ const char *key, connman_uint8_t value)
+{
+ return set_static_property(element, key, DBUS_TYPE_BYTE, &value);
}
-static void emit_devices_signal(DBusConnection *conn)
+/**
+ * connman_element_get_uint8:
+ * @element: element structure
+ * @key: unique identifier
+ *
+ * Get integer value for specific key
+ */
+connman_uint8_t connman_element_get_uint8(struct connman_element *element,
+ const char *key)
{
- DBusMessage *signal;
- DBusMessageIter entry;
+ connman_uint8_t value;
- DBG("conn %p", conn);
+ if (get_static_property(element, key, &value) == FALSE)
+ return 0;
- signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
- if (signal == NULL)
- return;
+ return value;
+}
- dbus_message_iter_init_append(signal, &entry);
+/**
+ * connman_element_set_blob:
+ * @element: element structure
+ * @key: unique identifier
+ * @data: blob data
+ * @size: blob size
+ *
+ * Set binary blob value for specific key
+ */
+int connman_element_set_blob(struct connman_element *element,
+ const char *key, const void *data, unsigned int size)
+{
+ return set_static_array_property(element, key,
+ DBUS_TYPE_BYTE, &data, size);
+}
+
+/**
+ * connman_element_get_blob:
+ * @element: element structure
+ * @key: unique identifier
+ * @size: pointer to blob size
+ *
+ * Get binary blob value for specific key
+ */
+const void *connman_element_get_blob(struct connman_element *element,
+ const char *key, unsigned int *size)
+{
+ void *value;
- append_devices(&entry);
+ if (get_static_array_property(element, key, &value, size) == FALSE)
+ return NULL;
- g_dbus_send_message(conn, signal);
+ return value;
}
-static void append_connections(DBusMessageIter *entry)
+int __connman_element_append_ipv4(struct connman_element *element,
+ DBusMessageIter *dict)
{
- DBusMessageIter value, iter;
- const char *key = "Connections";
+ const char *method = NULL;
+ const char *address = NULL, *netmask = NULL, *gateway = NULL;
- dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
+ connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_IPV4_METHOD, &method);
- dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
- &value);
+ connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_IPV4_ADDRESS, &address);
+ connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_IPV4_NETMASK, &netmask);
+ connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
+
+ if (method != NULL)
+ connman_dbus_dict_append_variant(dict, "IPv4.Method",
+ DBUS_TYPE_STRING, &method);
- dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+ if (address != NULL)
+ connman_dbus_dict_append_variant(dict, "IPv4.Address",
+ DBUS_TYPE_STRING, &address);
- __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
+ if (netmask != NULL)
+ connman_dbus_dict_append_variant(dict, "IPv4.Netmask",
+ DBUS_TYPE_STRING, &netmask);
- dbus_message_iter_close_container(&value, &iter);
+ if (gateway != NULL)
+ connman_dbus_dict_append_variant(dict, "IPv4.Gateway",
+ DBUS_TYPE_STRING, &gateway);
- dbus_message_iter_close_container(entry, &value);
+ return 0;
}
-static void emit_connections_signal(DBusConnection *conn)
+int __connman_element_set_ipv4(struct connman_element *element,
+ const char *name, DBusMessageIter *value)
{
- DBusMessage *signal;
- DBusMessageIter entry;
+ int type;
- DBG("conn %p", conn);
+ type = dbus_message_iter_get_arg_type(value);
- signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
- if (signal == NULL)
- return;
+ if (g_str_equal(name, "IPv4.Method") == TRUE) {
+ enum connman_ipv4_method method;
+ const char *str;
- dbus_message_iter_init_append(signal, &entry);
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(value, &str);
+ method = __connman_ipv4_string2method(str);
+ if (method == CONNMAN_IPV4_METHOD_UNKNOWN)
+ return -EINVAL;
- append_connections(&entry);
+ if (method == element->ipv4.method)
+ return -EALREADY;
- g_dbus_send_message(conn, signal);
+ element->ipv4.method = method;
+
+ connman_element_update(element);
+ } else if (g_str_equal(name, "IPv4.Address") == TRUE) {
+ const char *address;
+
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(value, &address);
+
+ g_free(element->ipv4.address);
+ element->ipv4.address = g_strdup(address);
+
+ connman_element_update(element);
+ } else if (g_str_equal(name, "IPv4.Netmask") == TRUE) {
+ const char *netmask;
+
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(value, &netmask);
+
+ g_free(element->ipv4.netmask);
+ element->ipv4.netmask = g_strdup(netmask);
+
+ connman_element_update(element);
+ } else if (g_str_equal(name, "IPv4.Gateway") == TRUE) {
+ const char *gateway;
+
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(value, &gateway);
+
+ g_free(element->ipv4.gateway);
+ element->ipv4.gateway = g_strdup(gateway);
+
+ connman_element_update(element);
+ }
+
+ return 0;
}
static void append_state(DBusMessageIter *entry, const char *state)
dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_STRING_AS_STRING, &value);
-
dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &state);
-
dbus_message_iter_close_container(entry, &value);
}
append_state(&entry, state);
g_dbus_send_message(conn, signal);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "StateChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &state);
+
+ g_dbus_send_message(conn, signal);
+}
+
+static void probe_element(struct connman_element *element)
+{
+ GSList *list;
+
+ DBG("element %p name %s", element, element->name);
+
+ for (list = driver_list; list; list = list->next) {
+ struct connman_driver *driver = list->data;
+
+ if (match_driver(element, driver) == FALSE)
+ continue;
+
+ DBG("driver %p name %s", driver, driver->name);
+
+ if (driver->probe(element) == 0) {
+ __connman_element_lock(element);
+ element->driver = driver;
+ __connman_element_unlock(element);
+ break;
+ }
+ }
}
static void register_element(gpointer data, gpointer user_data)
{
struct connman_element *element = data;
const gchar *basepath;
- GSList *list;
GNode *node;
- g_static_rw_lock_writer_lock(&element_lock);
-
__connman_element_lock(element);
if (element->parent) {
node = g_node_find(element_root, G_PRE_ORDER,
G_TRAVERSE_ALL, element->parent);
basepath = element->parent->path;
-
- if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_UNKNOWN)
- element->subtype = element->parent->subtype;
} else {
element->parent = element_root->data;
node = element_root;
- basepath = "";
+ basepath = "/device";
}
element->path = g_strdup_printf("%s/%s", basepath, element->name);
- set_reference_properties(element);
-
__connman_element_unlock(element);
- DBG("element %p path %s", element, element->path);
+ if (node == NULL) {
+ connman_error("Element registration for %s failed",
+ element->path);
+ return;
+ }
- __connman_element_load(element);
+ DBG("element %p path %s", element, element->path);
g_node_append_data(node, element);
-#if 0
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_ELEMENT_INTERFACE,
- element_methods, element_signals,
- NULL, element, NULL) == FALSE)
- connman_error("Failed to register %s element", element->path);
-#endif
-
- if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
- element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) {
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_DEVICE_INTERFACE,
- device_methods, element_signals,
- NULL, element, NULL) == FALSE)
- connman_error("Failed to register %s device",
- element->path);
- else
- emit_devices_signal(connection);
- }
+ if (element->type == CONNMAN_ELEMENT_TYPE_DHCP) {
+ element->parent->configuring = TRUE;
- if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_NETWORK_INTERFACE,
- network_methods, element_signals,
- NULL, element, NULL) == FALSE)
- connman_error("Failed to register %s network",
- element->path);
+ if (__connman_element_count(NULL,
+ CONNMAN_ELEMENT_TYPE_CONNECTION) == 0)
+ emit_state_change(connection, "connecting");
}
if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_CONNECTION_INTERFACE,
- connection_methods, element_signals,
- NULL, element, NULL) == FALSE)
- connman_error("Failed to register %s connection",
- element->path);
- else {
- emit_connections_signal(connection);
- emit_state_change(connection, "online");
- }
- }
-
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementAdded",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
- g_static_rw_lock_writer_unlock(&element_lock);
+ struct connman_element *parent = element->parent;
- __connman_element_store(element);
-
- g_static_rw_lock_writer_lock(&element_lock);
-
- for (list = driver_list; list; list = list->next) {
- struct connman_driver *driver = list->data;
-
- if (match_driver(element, driver) == FALSE)
- continue;
+ while (parent) {
+ parent->configuring = FALSE;
+ parent = parent->parent;
+ }
- DBG("driver %p name %s", driver, driver->name);
+ if (__connman_element_count(NULL,
+ CONNMAN_ELEMENT_TYPE_CONNECTION) == 1)
+ emit_state_change(connection, "online");
+ }
- if (driver->probe(element) == 0) {
- __connman_element_lock(element);
- element->driver = driver;
- __connman_element_unlock(element);
+ emit_element_signal(connection, "ElementAdded", element);
- enable_element(element);
- break;
- }
- }
+ if (started == FALSE)
+ return;
- g_static_rw_lock_writer_unlock(&element_lock);
+ probe_element(element);
}
/**
}
}
+ if (element->type == CONNMAN_ELEMENT_TYPE_DHCP)
+ element->ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+
element->parent = parent;
__connman_element_unlock(element);
if (element == root)
return FALSE;
+ if (node != NULL)
+ g_node_unlink(node);
+
if (element->driver) {
if (element->driver->remove)
element->driver->remove(element);
__connman_element_unlock(element);
}
- if (node != NULL) {
- g_node_unlink(node);
+ if (node != NULL)
g_node_destroy(node);
- }
-
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementRemoved",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
- emit_state_change(connection, "offline");
- emit_connections_signal(connection);
-
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_CONNECTION_INTERFACE);
- }
-
- if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK)
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_NETWORK_INTERFACE);
-
- if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
- element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) {
- emit_devices_signal(connection);
-
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_DEVICE_INTERFACE);
+ if (__connman_element_count(NULL,
+ CONNMAN_ELEMENT_TYPE_CONNECTION) == 0)
+ emit_state_change(connection, "offline");
}
-#if 0
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_ELEMENT_INTERFACE);
-#endif
+ emit_element_signal(connection, "ElementRemoved", element);
connman_element_unref(element);
DBG("element %p name %s", element, element->name);
- g_static_rw_lock_writer_lock(&element_lock);
-
node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
if (node != NULL)
g_node_traverse(node, G_POST_ORDER,
G_TRAVERSE_ALL, -1, remove_element, NULL);
-
- g_static_rw_lock_writer_unlock(&element_lock);
}
void connman_element_unregister_children(struct connman_element *element)
DBG("element %p name %s", element, element->name);
- g_static_rw_lock_writer_lock(&element_lock);
-
node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
if (node != NULL)
g_node_traverse(node, G_POST_ORDER,
G_TRAVERSE_ALL, -1, remove_element, element);
-
- g_static_rw_lock_writer_unlock(&element_lock);
}
static gboolean update_element(GNode *node, gpointer user_data)
if (element->driver && element->driver->update)
element->driver->update(element);
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
+ emit_element_signal(connection, "ElementUpdated", element);
return FALSE;
}
DBG("element %p name %s", element, element->name);
- g_static_rw_lock_reader_lock(&element_lock);
-
node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
if (node != NULL)
g_node_traverse(node, G_PRE_ORDER,
- G_TRAVERSE_ALL, -1, update_element, NULL);
-
- g_static_rw_lock_reader_unlock(&element_lock);
+ G_TRAVERSE_ALL, -1, update_element, element);
}
int connman_element_set_enabled(struct connman_element *element,
return 0;
}
-int __connman_element_init(DBusConnection *conn, const char *device)
+/**
+ * connman_element_set_error:
+ * @element: element structure
+ * @error: error identifier
+ *
+ * Set error state and specific error identifier
+ */
+void connman_element_set_error(struct connman_element *element,
+ enum connman_element_error error)
+{
+ struct connman_service *service;
+
+ DBG("element %p error %d", element, error);
+
+ if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
+ return;
+
+ element->state = CONNMAN_ELEMENT_STATE_ERROR;
+ element->error = error;
+
+ if (element->driver && element->driver->change)
+ element->driver->change(element);
+
+ service = __connman_element_get_service(element);
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_FAILURE);
+}
+
+int __connman_element_init(DBusConnection *conn, const char *device,
+ const char *nodevice)
{
struct connman_element *element;
device_filter = g_strdup(device);
- g_static_rw_lock_writer_lock(&element_lock);
-
element = connman_element_create("root");
element->path = g_strdup("/");
element->type = CONNMAN_ELEMENT_TYPE_ROOT;
- create_default_properties(element);
-
element_root = g_node_new(element);
- g_static_rw_lock_writer_unlock(&element_lock);
-
+ __connman_notifier_init();
+ __connman_service_init();
+ __connman_network_init();
__connman_device_init();
return 0;
}
+static gboolean probe_node(GNode *node, gpointer data)
+{
+ struct connman_element *element = node->data;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
+ return FALSE;
+
+ if (element->driver)
+ return FALSE;
+
+ probe_element(element);
+
+ return FALSE;
+}
+
+void __connman_element_start(void)
+{
+ DBG("");
+
+ g_node_traverse(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ probe_node, NULL);
+
+ started = TRUE;
+
+ __connman_storage_init_device();
+
+ __connman_connection_init();
+ __connman_ipv4_init();
+ __connman_detect_init();
+ __connman_rfkill_init();
+}
+
+void __connman_element_stop(void)
+{
+ DBG("");
+
+ __connman_rfkill_cleanup();
+ __connman_detect_cleanup();
+ __connman_ipv4_cleanup();
+ __connman_connection_cleanup();
+}
+
static gboolean free_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
DBG("");
__connman_device_cleanup();
+ __connman_network_cleanup();
+ __connman_service_cleanup();
+ __connman_notifier_cleanup();
- g_static_rw_lock_writer_lock(&element_lock);
g_node_traverse(element_root, G_POST_ORDER, G_TRAVERSE_ALL, -1,
free_driver, NULL);
- g_static_rw_lock_writer_unlock(&element_lock);
- g_static_rw_lock_writer_lock(&element_lock);
g_node_traverse(element_root, G_POST_ORDER, G_TRAVERSE_ALL, -1,
free_node, NULL);
- g_static_rw_lock_writer_unlock(&element_lock);
- g_static_rw_lock_writer_lock(&element_lock);
g_node_destroy(element_root);
element_root = NULL;
- g_static_rw_lock_writer_unlock(&element_lock);
g_free(device_filter);
projects / connman / blobdiff