*
* 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 gboolean started = FALSE;
+
static struct {
enum connman_property_id id;
int type;
DBUS_TYPE_STRING, "IPv4.Netmask" },
{ CONNMAN_PROPERTY_ID_IPV4_GATEWAY,
DBUS_TYPE_STRING, "IPv4.Gateway" },
+ { CONNMAN_PROPERTY_ID_IPV4_BROADCAST,
+ DBUS_TYPE_STRING, "IPv4.Broadcast" },
{ 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" },
-
{ }
};
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)
+const char *__connman_ipv4_method2string(enum connman_ipv4_method method)
{
- switch (type) {
- case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
+ switch (method) {
+ case CONNMAN_IPV4_METHOD_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";
+ case CONNMAN_IPV4_METHOD_OFF:
+ return "off";
+ case CONNMAN_IPV4_METHOD_STATIC:
+ return "static";
+ case CONNMAN_IPV4_METHOD_DHCP:
+ return "dhcp";
}
- return NULL;
+ return "unknown";
}
-static const char *policy2string(enum connman_element_policy policy)
+enum connman_ipv4_method __connman_ipv4_string2method(const char *method)
{
- switch (policy) {
- case CONNMAN_ELEMENT_POLICY_UNKNOWN:
- return "unknown";
- case CONNMAN_ELEMENT_POLICY_OFF:
- return "off";
- case CONNMAN_ELEMENT_POLICY_AUTO:
- return "auto";
- case CONNMAN_ELEMENT_POLICY_IGNORE:
- return "ignore";
- case CONNMAN_ELEMENT_POLICY_ASK:
- return "ask";
- }
-
- return NULL;
+ 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_IPV4_METHOD_UNKNOWN;
}
+#if 0
static void append_property(DBusMessageIter *dict,
struct connman_property *property)
{
if (property->value == NULL)
return;
- if (property->type == DBUS_TYPE_ARRAY)
+ switch (property->type) {
+ case DBUS_TYPE_ARRAY:
connman_dbus_dict_append_array(dict, property->name,
property->subtype, &property->value, property->size);
- else
+ 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;
+ }
}
static void add_common_properties(struct connman_element *element,
DBusMessageIter *dict)
{
+ 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 (element->ipv4.address != NULL)
+ if (address != NULL)
connman_dbus_dict_append_variant(dict, "IPv4.Address",
- DBUS_TYPE_STRING, &element->ipv4.address);
- if (element->ipv4.netmask != NULL)
+ DBUS_TYPE_STRING, &address);
+ if (netmask != NULL)
connman_dbus_dict_append_variant(dict, "IPv4.Netmask",
- DBUS_TYPE_STRING, &element->ipv4.netmask);
- if (element->ipv4.gateway != NULL)
+ DBUS_TYPE_STRING, &netmask);
+ if (gateway != NULL)
connman_dbus_dict_append_variant(dict, "IPv4.Gateway",
- DBUS_TYPE_STRING, &element->ipv4.gateway);
+ DBUS_TYPE_STRING, &gateway);
if (element->wifi.security != NULL) {
const char *passphrase = "";
__connman_element_unlock(element);
}
+#endif
-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;
-}
-
-static DBusMessage *do_update(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
-
- DBG("conn %p", conn);
-
- if (element->enabled == FALSE)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
- if (element->driver && element->driver->update) {
- DBG("Calling update callback");
- element->driver->update(element);
- }
-
- 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 g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
- if (element->driver && element->driver->enable) {
- DBG("Calling enable callback");
- if (element->driver->enable(element) < 0)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- }
-
- element->enabled = TRUE;
-
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-
- 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 g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
- if (element->driver && element->driver->disable) {
- DBG("Calling disable callback");
- if (element->driver->disable(element) < 0)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- }
-
- element->enabled = FALSE;
-
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static void append_networks(DBusMessageIter *dict)
-{
- DBusMessageIter entry, value, iter;
- const char *key = "Networks";
-
- 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(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 *get_device_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void emit_element_signal(DBusConnection *conn, const char *member,
+ struct connman_element *element)
{
- 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 = policy2string(element->policy);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Policy",
- DBUS_TYPE_STRING, &str);
+ DBusMessage *signal;
- connman_dbus_dict_append_variant(&dict, "Powered",
- DBUS_TYPE_BOOLEAN, &element->enabled);
+ if (__connman_debug_enabled() == FALSE)
+ return;
- append_networks(&dict);
+ DBG("conn %p member %s", conn, member);
- add_common_properties(element, &dict);
+ if (element == NULL)
+ return;
- 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);
}
-static DBusMessage *set_device_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, "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);
-}
+struct foreach_data {
+ enum connman_element_type type;
+ element_cb_t callback;
+ gpointer user_data;
+};
-static DBusMessage *get_network_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static gboolean foreach_callback(GNode *node, gpointer user_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);
+ struct connman_element *element = node->data;
+ struct foreach_data *data = user_data;
- str = policy2string(element->policy);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Policy",
- DBUS_TYPE_STRING, &str);
+ DBG("element %p name %s", element, element->name);
- connman_dbus_dict_append_variant(&dict, "Connected",
- DBUS_TYPE_BOOLEAN, &element->enabled);
+ if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
+ return FALSE;
- add_common_properties(element, &dict);
+ if (data->type != CONNMAN_ELEMENT_TYPE_UNKNOWN &&
+ data->type != element->type)
+ return FALSE;
- dbus_message_iter_close_container(&array, &dict);
+ if (data->callback)
+ data->callback(element, data->user_data);
- return reply;
+ return FALSE;
}
-static DBusMessage *set_network_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;
- 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);
+ struct foreach_data data = { type, callback, user_data };
+ GNode *node;
- if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
- const char *str;
+ DBG("");
- dbus_message_iter_get_basic(&value, &str);
- g_free(element->wifi.passphrase);
- element->wifi.passphrase = g_strdup(str);
+ if (element != NULL) {
+ node = g_node_find(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, element);
+ if (node == NULL)
+ return;
} 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);
-
- return reply;
-}
-
-static DBusMessage *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);
-
- set_common_property(element, name, &value);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *clear_property(DBusConnection *conn,
- DBusMessage *msg, void *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);
+ node = element_root;
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ foreach_callback, &data);
}
-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 },
- { },
-};
-
-static GDBusSignalTable element_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
-
-static GDBusMethodTable device_methods[] = {
- { "GetProperties", "", "a{sv}", get_device_properties },
- { "SetProperty", "sv", "", set_device_property },
- { },
-};
-
-static GDBusMethodTable network_methods[] = {
- { "GetProperties", "", "a{sv}", get_network_properties },
- { "SetProperty", "sv", "", set_network_property },
- { "Connect", "", "", do_enable },
- { "Disconnect", "", "", do_disable },
- { },
-};
-
-static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", get_connection_properties },
- { },
-};
-
struct append_filter {
enum connman_element_type type;
DBusMessageIter *iter;
filter->type != element->type)
return FALSE;
+ if (filter->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
+ __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,
DBUS_TYPE_OBJECT_PATH, &element->path);
return FALSE;
}
-void __connman_element_list(enum connman_element_type type,
- DBusMessageIter *iter)
+void __connman_element_list(struct connman_element *element,
+ enum connman_element_type type,
+ DBusMessageIter *iter)
{
struct append_filter filter = { type, iter };
+ GNode *node;
DBG("");
- g_static_rw_lock_reader_lock(&element_lock);
- g_node_traverse(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
- append_path, &filter);
- g_static_rw_lock_reader_unlock(&element_lock);
+ if (element != NULL) {
+ node = g_node_find(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, element);
+ if (node == NULL)
+ return;
+ } else
+ node = element_root;
+
+ g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ append_path, &filter);
}
struct count_data {
return FALSE;
}
-int __connman_element_count(enum connman_element_type type)
+int __connman_element_count(struct connman_element *element,
+ enum connman_element_type type)
{
struct count_data data = { type, 0 };
+ GNode *node;
DBG("");
- g_static_rw_lock_reader_lock(&element_lock);
- g_node_traverse(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
- count_element, &data);
- g_static_rw_lock_reader_unlock(&element_lock);
+ if (element != NULL) {
+ node = g_node_find(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, element);
+ if (node == NULL)
+ return 0;
+ } else
+ node = element_root;
+
+ g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ count_element, &data);
return data.count;
}
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;
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;
}
{
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);
-
- g_static_rw_lock_writer_unlock(&element_lock);
}
/**
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;
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);
g_free(element->ipv4.network);
g_free(element->ipv4.broadcast);
g_free(element->ipv4.nameserver);
+ g_free(element->devname);
g_free(element->path);
g_free(element->name);
g_free(element);
DBG("element %p name %s", element, element->name);
- if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE &&
- type != DBUS_TYPE_INT32)
+ if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE)
return -EINVAL;
property = g_try_new0(struct connman_property, 1);
if (property->value != NULL)
memcpy(property->value, value, 1);
break;
- case DBUS_TYPE_INT32:
- property->value = g_try_malloc(sizeof(gint32));
- if (property->value != NULL)
- memcpy(property->value, value, sizeof(gint32));
- break;
}
__connman_element_lock(element);
return 0;
}
+int connman_element_set_static_property(struct connman_element *element,
+ const char *name, int type, const void *value)
+{
+ GSList *list;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ __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;
+
+ property->type = type;
+ g_free(property->value);
+
+ switch (type) {
+ case DBUS_TYPE_STRING:
+ property->value = g_strdup(*((const char **) value));
+ break;
+ case DBUS_TYPE_BYTE:
+ property->value = g_try_malloc(1);
+ if (property->value != NULL)
+ memcpy(property->value, value, 1);
+ break;
+ }
+ }
+
+ __connman_element_unlock(element);
+
+ return 0;
+}
+
int connman_element_add_static_array_property(struct connman_element *element,
const char *name, int type, const void *value, int len)
{
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;
}
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-
return 0;
}
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)
+ 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->ipv4.nameserver;
+ *((char **) value) = element->ipv4.broadcast;
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
- if (element->wifi.security == NULL)
- return connman_element_get_value(element->parent,
- id, value);
- __connman_element_lock(element);
- *((char **) value) = element->wifi.security;
- __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:
switch (property->type) {
case DBUS_TYPE_STRING:
*((char **) value) = property->value;
+ found = TRUE;
break;
case DBUS_TYPE_BYTE:
- *((guint8 *) value) = *((guint8 *) property->value);
- break;
- case DBUS_TYPE_INT32:
- *((gint32 *) value) = *((gint32 *) property->value);
+ memcpy(value, property->value, 1);
+ found = TRUE;
break;
}
- found = TRUE;
break;
}
}
__connman_element_unlock(element);
+ if (found == FALSE && element->parent != NULL)
+ return connman_element_get_static_property(element->parent,
+ name, value);
+
return found;
}
return result;
}
-static void append_devices(DBusMessageIter *entry)
-{
- 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);
-
- dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
- //__connman_element_list(CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
-
- dbus_message_iter_close_container(&value, &iter);
-
- dbus_message_iter_close_container(entry, &value);
-}
-
-static void emit_devices_signal(DBusConnection *conn)
-{
- DBusMessage *signal;
- DBusMessageIter entry;
-
- DBG("conn %p", conn);
-
- signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
- if (signal == NULL)
- return;
-
- dbus_message_iter_init_append(signal, &entry);
-
- append_devices(&entry);
-
- g_dbus_send_message(conn, signal);
-}
-
static void append_connections(DBusMessageIter *entry)
{
DBusMessageIter value, iter;
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
- //__connman_element_list(CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
-
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_close_container(entry, &value);
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);
}
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;
DBG("element %p path %s", element, element->path);
- __connman_element_load(element);
-
g_node_append_data(node, element);
- 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);
-
- 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_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 (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");
- }
+ emit_connections_signal(connection);
+ emit_state_change(connection, "online");
}
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementAdded",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-
- g_static_rw_lock_writer_unlock(&element_lock);
-
- __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;
+ emit_element_signal(connection, "ElementAdded", element);
- 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;
- }
- }
+ if (started == FALSE)
+ return;
- g_static_rw_lock_writer_unlock(&element_lock);
+ probe_element(element);
}
/**
{
DBG("element %p name %s parent %p", element, element->name, parent);
+ if (element->devname == NULL)
+ element->devname = g_strdup(element->name);
+
if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) {
if (g_pattern_match_simple(device_filter,
- element->name) == FALSE) {
- DBG("ignoring %s device", element->name);
+ element->devname) == FALSE) {
+ DBG("ignoring %s [%s] device", element->name,
+ element->devname);
return -EPERM;
}
}
}
}
+ 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);
- }
-
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementRemoved",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
- emit_state_change(connection, "offline");
+ if (__connman_element_count(NULL,
+ CONNMAN_ELEMENT_TYPE_CONNECTION) == 0)
+ 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);
}
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_ELEMENT_INTERFACE);
+ emit_element_signal(connection, "ElementRemoved", element);
connman_element_unref(element);
return FALSE;
}
-static void unregister_element(gpointer data, gpointer user_data)
+void connman_element_unregister(struct connman_element *element)
{
- struct connman_element *element = data;
GNode *node;
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(struct connman_element *element)
-{
- DBG("element %p name %s", element, element->name);
-
- unregister_element(element, NULL);
}
-static void unregister_children(gpointer data, gpointer user_data)
+void connman_element_unregister_children(struct connman_element *element)
{
- struct connman_element *element = data;
GNode *node;
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);
-}
-
-void connman_element_unregister_children(struct connman_element *element)
-{
- DBG("element %p name %s", element, element->name);
-
- unregister_children(element, NULL);
}
static gboolean update_element(GNode *node, gpointer user_data)
if (element->driver && element->driver->update)
element->driver->update(element);
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
+ 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,
element->enabled = enabled;
- connman_element_update(element);
-
return 0;
}
device_filter = g_strdup(device);
- g_static_rw_lock_writer_lock(&element_lock);
-
element = connman_element_create("root");
element->path = g_strdup("/");
element_root = g_node_new(element);
- g_static_rw_lock_writer_unlock(&element_lock);
-
+ __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();
+}
+
+void __connman_element_stop(void)
+{
+ DBG("");
+
+ __connman_detect_cleanup();
+ __connman_ipv4_cleanup();
+ __connman_connection_cleanup();
+}
+
static gboolean free_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
DBG("element %p name %s", element, element->name);
if (g_node_depth(node) > 1)
- unregister_element(element, NULL);
+ connman_element_unregister(element);
return FALSE;
}
DBG("");
__connman_device_cleanup();
+ __connman_network_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