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 {
return CONNMAN_ELEMENT_POLICY_UNKNOWN;
}
+const char *__connman_ipv4_method2string(enum connman_ipv4_method method)
+{
+ switch (method) {
+ case CONNMAN_IPV4_METHOD_UNKNOWN:
+ return "unknown";
+ case CONNMAN_IPV4_METHOD_OFF:
+ return "off";
+ case CONNMAN_IPV4_METHOD_STATIC:
+ return "static";
+ case CONNMAN_IPV4_METHOD_DHCP:
+ return "dhcp";
+ }
+
+ return "unknown";
+}
+
+enum connman_ipv4_method __connman_ipv4_string2method(const char *method)
+{
+ 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;
+}
+
static void append_property(DBusMessageIter *dict,
struct connman_property *property)
{
__connman_element_unlock(element);
}
+static void emit_enabled_signal(DBusConnection *conn,
+ struct connman_element *element)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *iface, *key;
+
+ DBG("conn %p", conn);
+
+ if (element == NULL)
+ return;
+
+ switch (element->type) {
+ case CONNMAN_ELEMENT_TYPE_DEVICE:
+ iface = CONNMAN_DEVICE_INTERFACE;
+ key = "Powered";
+ break;
+ case CONNMAN_ELEMENT_TYPE_NETWORK:
+ iface = CONNMAN_NETWORK_INTERFACE;
+ key = "Connected";
+ break;
+ default:
+ return;
+ }
+
+ signal = dbus_message_new_signal(element->path,
+ iface, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_BOOLEAN_AS_STRING, &value);
+
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
+ &element->enabled);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(conn, signal);
+}
+
static DBusMessage *do_update(DBusConnection *conn,
DBusMessage *msg, void *data)
{
element->enabled = TRUE;
+ emit_enabled_signal(connection, element);
+
#if 0
g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
element->enabled = FALSE;
+ emit_enabled_signal(connection, element);
+
#if 0
g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
}
static void append_networks(struct connman_element *element,
- DBusMessageIter *dict)
+ DBusMessageIter *entry)
{
- DBusMessageIter entry, value, iter;
+ DBusMessageIter value, iter;
const char *key = "Networks";
if (element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIFI &&
element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIMAX)
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_append_basic(entry, DBUS_TYPE_STRING, &key);
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
&value);
dbus_message_iter_close_container(&value, &iter);
- dbus_message_iter_close_container(&entry, &value);
-
- dbus_message_iter_close_container(dict, &entry);
+ dbus_message_iter_close_container(entry, &value);
}
-static DBusMessage *get_device_properties(DBusConnection *conn,
+static DBusMessage *device_get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
DBusMessage *reply;
- DBusMessageIter array, dict;
+ DBusMessageIter array, dict, entry;
const char *str;
DBG("conn %p", conn);
connman_dbus_dict_append_variant(&dict, "Powered",
DBUS_TYPE_BOOLEAN, &element->enabled);
- append_networks(element, &dict);
+ dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ append_networks(element, &entry);
+
+ dbus_message_iter_close_container(&dict, &entry);
add_common_properties(element, &dict);
return reply;
}
-static DBusMessage *set_device_property(DBusConnection *conn,
+static DBusMessage *device_set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
- DBusMessageIter iter;
- DBusMessageIter value;
+ DBusMessageIter iter, value;
const char *name;
DBG("conn %p", conn);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *get_network_properties(DBusConnection *conn,
+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;
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 *set_network_property(DBusConnection *conn,
+static DBusMessage *network_set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
if (__connman_security_check_privileges(msg) < 0)
return __connman_error_permission_denied(msg);
- if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
+ 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);
};
static GDBusMethodTable device_methods[] = {
- { "GetProperties", "", "a{sv}", get_device_properties },
- { "SetProperty", "sv", "", set_device_property },
- { "Scan", "", "", do_update },
+ { "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 },
{ },
};
static GDBusMethodTable network_methods[] = {
- { "GetProperties", "", "a{sv}", get_network_properties },
- { "SetProperty", "sv", "", set_network_property },
+ { "GetProperties", "", "a{sv}", network_get_properties },
+ { "SetProperty", "sv", "", network_set_property },
{ "Connect", "", "", do_enable },
{ "Disconnect", "", "", do_disable },
{ },
filter->type != element->type)
return FALSE;
+ if (filter->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_NETWORK)
+ return FALSE;
+
dbus_message_iter_append_basic(filter->iter,
DBUS_TYPE_OBJECT_PATH, &element->path);
} 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;
}
return;
if (element->driver && element->driver->enable) {
- if (element->driver->enable(element) == 0)
+ if (element->driver->enable(element) == 0) {
element->enabled = TRUE;
+ emit_enabled_signal(connection, element);
+ }
}
}
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);
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;
}
return;
if (element->driver && element->driver->disable) {
- if (element->driver->disable(element) == 0)
+ if (element->driver->disable(element) == 0) {
element->enabled = FALSE;
+ emit_enabled_signal(connection, 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);
-
- g_static_rw_lock_writer_unlock(&element_lock);
}
/**
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);
g_dbus_send_message(conn, signal);
}
+static void emit_networks_signal(DBusConnection *conn,
+ struct connman_element *device)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry;
+
+ DBG("conn %p", conn);
+
+ if (device == NULL)
+ return;
+
+ signal = dbus_message_new_signal(device->path,
+ CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ append_networks(device, &entry);
+
+ g_dbus_send_message(conn, signal);
+}
+
static void append_connections(DBusMessageIter *entry)
{
DBusMessageIter value, iter;
GSList *list;
GNode *node;
- g_static_rw_lock_writer_lock(&element_lock);
-
__connman_element_lock(element);
if (element->parent) {
NULL, element, NULL) == FALSE)
connman_error("Failed to register %s network",
element->path);
+ else
+ emit_networks_signal(connection, element->parent);
}
if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
DBUS_TYPE_INVALID);
#endif
- 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;
break;
}
}
-
- g_static_rw_lock_writer_unlock(&element_lock);
}
/**
{
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;
}
}
return FALSE;
if (element->driver) {
+ disable_element(element);
+
if (element->driver->remove)
element->driver->remove(element);
CONNMAN_CONNECTION_INTERFACE);
}
- if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK)
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
+ emit_networks_signal(connection, element->parent);
+
g_dbus_unregister_interface(connection, element->path,
CONNMAN_NETWORK_INTERFACE);
+ }
if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) {
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)
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);
}
int connman_element_set_enabled(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_root = g_node_new(element);
- g_static_rw_lock_writer_unlock(&element_lock);
-
__connman_device_init();
return 0;
DBG("element %p name %s", element, element->name);
if (element->driver) {
+ disable_element(element);
+
if (element->driver->remove)
element->driver->remove(element);
__connman_device_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