static DBusConnection *connection;
-static GStaticRWLock element_lock = G_STATIC_RW_LOCK_INIT;
static GNode *element_root = NULL;
-
static GSList *driver_list = NULL;
-
-static GThreadPool *thread_register = NULL;
-static GThreadPool *thread_unregister = NULL;
-static GThreadPool *thread_unregister_children = NULL;
-
static gchar *device_filter = NULL;
static struct {
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" },
return "device";
case CONNMAN_ELEMENT_TYPE_NETWORK:
return "network";
+ case CONNMAN_ELEMENT_TYPE_SERVICE:
+ return "service";
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";
}
return NULL;
}
+static const char *subtype2description(enum connman_element_subtype type)
+{
+ switch (type) {
+ case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
+ case CONNMAN_ELEMENT_SUBTYPE_FAKE:
+ case CONNMAN_ELEMENT_SUBTYPE_NETWORK:
+ return NULL;
+ case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
+ return "Ethernet";
+ case CONNMAN_ELEMENT_SUBTYPE_WIFI:
+ return "Wireless";
+ 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)
+{
+ switch (policy) {
+ case CONNMAN_ELEMENT_POLICY_UNKNOWN:
+ return "unknown";
+ case CONNMAN_ELEMENT_POLICY_IGNORE:
+ return "ignore";
+ case CONNMAN_ELEMENT_POLICY_AUTO:
+ return "auto";
+ case CONNMAN_ELEMENT_POLICY_ASK:
+ return "ask";
+ }
+
+ return NULL;
+}
+
+enum connman_element_policy __connman_element_string2policy(const char *policy)
+{
+ 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;
+ else
+ 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)
{
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 = "";
DBUS_TYPE_STRING, &passphrase);
}
- connman_element_lock(element);
+ __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);
+ __connman_element_unlock(element);
}
-static DBusMessage *get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void set_common_property(struct connman_element *element,
+ const char *name, DBusMessageIter *value)
{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *str;
+ GSList *list;
- DBG("conn %p", conn);
+ if (g_str_equal(name, "Priority") == TRUE) {
+ dbus_message_iter_get_basic(value, &element->priority);
+ return;
+ }
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ __connman_element_lock(element);
- dbus_message_iter_init_append(reply, &array);
+ for (list = element->properties; list; list = list->next) {
+ struct connman_property *property = list->data;
+ const char *str;
- 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 (g_str_equal(property->name, name) == FALSE)
+ continue;
- 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);
+ 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;
}
- 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_element_unlock(element);
+}
- connman_dbus_dict_append_variant(&dict, "Enabled",
- DBUS_TYPE_BOOLEAN, &element->enabled);
+static void emit_enabled_signal(DBusConnection *conn,
+ struct connman_element *element)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *iface, *key;
- add_common_properties(element, &dict);
+ DBG("conn %p", conn);
- dbus_message_iter_close_container(&array, &dict);
+ if (element == NULL)
+ return;
- return reply;
-}
+ 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;
+ case CONNMAN_ELEMENT_TYPE_CONNECTION:
+ iface = CONNMAN_CONNECTION_INTERFACE;
+ key = "Default";
+ break;
+ default:
+ return;
+ }
-static void append_networks(DBusMessageIter *dict)
-{
- DBusMessageIter entry, value, iter;
- const char *key = "Networks";
+ signal = dbus_message_new_signal(element->path,
+ iface, "PropertyChanged");
+ if (signal == NULL)
+ return;
- dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
+ 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_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
- &value);
+ DBUS_TYPE_BOOLEAN_AS_STRING, &value);
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
+ &element->enabled);
+ dbus_message_iter_close_container(&entry, &value);
- dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+ g_dbus_send_message(conn, signal);
+}
- __connman_element_list(CONNMAN_ELEMENT_TYPE_NETWORK, &iter);
+static void emit_scanning_signal(DBusConnection *conn,
+ struct connman_element *element)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *key = "Scanning";
- dbus_message_iter_close_container(&value, &iter);
+ DBG("conn %p", conn);
+
+ if (element == NULL)
+ return;
+
+ if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
+ return;
+ signal = dbus_message_new_signal(element->path,
+ CONNMAN_DEVICE_INTERFACE, "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->scanning);
dbus_message_iter_close_container(&entry, &value);
- dbus_message_iter_close_container(dict, &entry);
+ g_dbus_send_message(conn, signal);
}
-static DBusMessage *get_device_properties(DBusConnection *conn,
+static DBusMessage *do_update(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;
+ if (element->enabled == FALSE)
+ return __connman_error_failed(msg);
- dbus_message_iter_init_append(reply, &array);
+ if (element->driver && element->driver->update) {
+ DBG("Calling update callback");
+ if (element->driver->update(element) < 0)
+ return __connman_error_failed(msg);
- 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);
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
- connman_dbus_dict_append_variant(&dict, "Powered",
- DBUS_TYPE_BOOLEAN, &element->enabled);
+static DBusMessage *do_enable(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_element *element = data;
- append_networks(&dict);
+ DBG("conn %p", conn);
- add_common_properties(element, &dict);
+ if (element->enabled == TRUE)
+ return __connman_error_failed(msg);
- dbus_message_iter_close_container(&array, &dict);
+ if (element->driver && element->driver->enable) {
+ DBG("Calling enable callback");
+ if (element->driver->enable(element) < 0)
+ return __connman_error_failed(msg);
+ }
- return reply;
+ element->enabled = TRUE;
+
+ emit_enabled_signal(connection, element);
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *get_network_properties(DBusConnection *conn,
+static DBusMessage *do_disable(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;
+ if (element->enabled == FALSE)
+ return __connman_error_failed(msg);
- dbus_message_iter_init_append(reply, &array);
+ if (element->driver && element->driver->disable) {
+ DBG("Calling disable callback");
+ if (element->driver->disable(element) < 0)
+ return __connman_error_failed(msg);
+ }
- 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);
+ element->enabled = FALSE;
- connman_dbus_dict_append_variant(&dict, "Connected",
- DBUS_TYPE_BOOLEAN, &element->enabled);
+ emit_enabled_signal(connection, element);
- add_common_properties(element, &dict);
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
- dbus_message_iter_close_container(&array, &dict);
+static void append_networks(struct connman_element *element,
+ DBusMessageIter *entry)
+{
+ DBusMessageIter value, iter;
+ const char *key = "Networks";
- return reply;
+ 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);
}
-static DBusMessage *get_connection_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);
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ str = subtype2description(element->subtype);
+ if (str != NULL && element->devname != NULL) {
+ char *name = g_strdup_printf("%s (%s)", str, element->devname);
+ if (name != NULL)
+ connman_dbus_dict_append_variant(&dict, "Name",
+ DBUS_TYPE_STRING, &name);
+ g_free(name);
+ }
+
+ 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);
+
+ if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX ||
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH) {
+ connman_dbus_dict_append_variant(&dict, "Scanning",
+ DBUS_TYPE_BOOLEAN, &element->scanning);
+
+ 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);
dbus_message_iter_close_container(&array, &dict);
return reply;
}
-static DBusMessage *set_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;
- GSList *list;
DBG("conn %p", conn);
if (__connman_security_check_privileges(msg) < 0)
return __connman_error_permission_denied(msg);
- connman_element_lock(element);
+ if (g_str_equal(name, "Powered") == TRUE) {
+ dbus_bool_t powered;
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
- const char *str;
+ dbus_message_iter_get_basic(&value, &powered);
- if (g_str_equal(property->name, name) == FALSE)
- continue;
+ if (powered == TRUE)
+ do_enable(conn, msg, element);
+ else
+ do_disable(conn, msg, element);
+ } else
+ set_common_property(element, name, &value);
- if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
- continue;
+ __connman_element_store(element);
- property->flags &= ~CONNMAN_PROPERTY_FLAG_REFERENCE;
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
- 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;
- }
+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;
+ }
- connman_element_unlock(element);
+ dbus_message_iter_next(iter);
+ }
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ return 0;
}
-static DBusMessage *clear_property(DBusConnection *conn,
+static DBusMessage *device_create_network(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
- const char *name;
- GSList *list;
+ struct connman_element *network;
+ DBusMessageIter iter, array;
+ const char *ssid = NULL, *security = NULL, *passphrase = NULL;
DBG("conn %p", conn);
- if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID) == FALSE)
+ if (element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIFI)
return __connman_error_invalid_arguments(msg);
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
+ if (dbus_message_iter_init(msg, &iter) == FALSE)
+ return __connman_error_invalid_arguments(msg);
- connman_element_lock(element);
+ dbus_message_iter_recurse(&iter, &array);
+ parse_network_dict(&array, &ssid, &security, &passphrase);
+ if (ssid == NULL)
+ return __connman_error_invalid_arguments(msg);
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
+ DBG("ssid %s security %s passphrase %s", ssid, security, passphrase);
- if (g_str_equal(property->name, name) == FALSE)
- continue;
+ network = connman_element_create(ssid);
- if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
- continue;
+ network->type = CONNMAN_ELEMENT_TYPE_NETWORK;
+ network->index = element->index;
- if (property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE)
- continue;
+ network->remember = TRUE;
- property->flags |= CONNMAN_PROPERTY_FLAG_REFERENCE;
+ connman_element_add_static_property(network, "Name",
+ DBUS_TYPE_STRING, &ssid);
- if (property->type == DBUS_TYPE_STRING)
- g_free(property->value);
+ connman_element_add_static_array_property(element, "WiFi.SSID",
+ DBUS_TYPE_BYTE, &ssid, strlen(ssid));
- property->value = NULL;
- }
+ network->wifi.security = g_strdup(security);
+ network->wifi.passphrase = g_strdup(passphrase);
+
+ connman_element_register(network, element);
- connman_element_unlock(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 *do_update(DBusConnection *conn,
+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);
- if (element->enabled == FALSE)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
- if (element->driver && element->driver->update) {
- DBG("Calling update callback");
- element->driver->update(element);
- }
+ dbus_message_iter_init_append(reply, &array);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ 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)
+ connman_dbus_dict_append_variant(&dict, "Device",
+ DBUS_TYPE_OBJECT_PATH, &element->parent->path);
+
+ 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 *do_enable(DBusConnection *conn,
+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 (element->enabled == TRUE)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ if (dbus_message_iter_init(msg, &iter) == FALSE)
+ return __connman_error_invalid_arguments(msg);
- 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);
- }
+ dbus_message_iter_get_basic(&iter, &name);
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &value);
- element->enabled = TRUE;
+ if (__connman_security_check_privileges(msg) < 0)
+ return __connman_error_permission_denied(msg);
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
+ 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 *do_disable(DBusConnection *conn,
+static DBusMessage *connection_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);
- if (element->enabled == FALSE)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
- 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);
- }
+ dbus_message_iter_init_append(reply, &array);
- element->enabled = FALSE;
+ 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);
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
+ str = subtype2string(element->subtype);
+ if (str != NULL)
+ connman_dbus_dict_append_variant(&dict, "Type",
+ DBUS_TYPE_STRING, &str);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX)
+ connman_dbus_dict_append_variant(&dict, "Strength",
+ DBUS_TYPE_BYTE, &element->strength);
+
+ connman_dbus_dict_append_variant(&dict, "Default",
+ DBUS_TYPE_BOOLEAN, &element->enabled);
+
+ add_common_properties(element, &dict);
+
+ dbus_message_iter_close_container(&array, &dict);
+
+ return reply;
}
-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 DBusMessage *connection_set_property(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_element *element = data;
+ DBusMessageIter iter, value;
+ const char *name;
-static GDBusSignalTable element_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
+ 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, "Default") == TRUE) {
+ dbus_bool_t enabled;
+
+ dbus_message_iter_get_basic(&value, &enabled);
+
+ if (enabled == TRUE)
+ return do_enable(conn, msg, element);
+ else
+ return do_disable(conn, msg, element);
+ }
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
static GDBusMethodTable device_methods[] = {
- { "GetProperties", "", "a{sv}", get_device_properties },
+ { "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 },
+ { "GetProperties", "", "a{sv}", network_get_properties },
+ { "SetProperty", "sv", "", network_set_property },
+ { "Connect", "", "", do_enable },
+ { "Disconnect", "", "", do_disable },
{ },
};
static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", get_connection_properties },
+ { "GetProperties", "", "a{sv}", connection_get_properties },
+ { "SetProperty", "sv", "", connection_set_property },
+ { },
+};
+
+static GDBusSignalTable element_signals[] = {
+ { "PropertyChanged", "sv" },
{ },
};
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);
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;
}
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;
+ emit_enabled_signal(connection, element);
+ }
+ }
+}
+
static gboolean probe_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
if (driver->probe(element) < 0)
return FALSE;
- connman_element_lock(element);
+ __connman_element_lock(element);
element->driver = driver;
- connman_element_unlock(element);
+ __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);
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;
+ emit_enabled_signal(connection, element);
+ }
+ }
+}
+
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);
- connman_element_lock(element);
+ __connman_element_lock(element);
element->driver = NULL;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
}
return FALSE;
{
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->refcount = 1;
- g_static_mutex_init(&element->mutex);
-
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;
DBG("element %p name %s", element, element->name);
- connman_element_lock(element);
+ __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)) {
- if (property->type == DBUS_TYPE_STRING)
- g_free(property->value);
- if (property->type == DBUS_TYPE_ARRAY &&
- property->subtype == DBUS_TYPE_BYTE)
- g_free(property->value);
- }
+ if (!(property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE))
+ g_free(property->value);
+ g_free(property->name);
g_free(property);
}
element->properties = NULL;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
}
void connman_element_unref(struct connman_element *element)
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);
}
}
-int connman_element_add_static_property(struct connman_element *element,
+int connman_element_add_static_property(struct connman_element *element,
+ const char *name, int type, const void *value)
+{
+ struct connman_property *property;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ property = g_try_new0(struct connman_property, 1);
+ 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;
+
+ DBG("name %s type %d value %p", name, type, 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_lock(element);
+ element->properties = g_slist_append(element->properties, property);
+ __connman_element_unlock(element);
+
+ return 0;
+}
+
+static void emit_property_changed(DBusConnection *conn,
+ struct connman_element *element,
+ const char *name, int type, const void *data)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *iface, *sig;
+
+ DBG("conn %p", conn);
+
+ switch (element->type) {
+ case CONNMAN_ELEMENT_TYPE_DEVICE:
+ iface = CONNMAN_DEVICE_INTERFACE;
+ break;
+ case CONNMAN_ELEMENT_TYPE_NETWORK:
+ iface = CONNMAN_NETWORK_INTERFACE;
+ break;
+ case CONNMAN_ELEMENT_TYPE_CONNECTION:
+ iface = CONNMAN_CONNECTION_INTERFACE;
+ 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, &name);
+
+ switch (type) {
+ case DBUS_TYPE_STRING:
+ sig = DBUS_TYPE_STRING_AS_STRING;
+ break;
+ case DBUS_TYPE_BYTE:
+ sig = DBUS_TYPE_BYTE_AS_STRING;
+ break;
+ default:
+ sig = DBUS_TYPE_VARIANT_AS_STRING;
+ break;
+ }
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ sig, &value);
+ dbus_message_iter_append_basic(&value, type, data);
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(conn, signal);
+}
+
+int connman_element_set_static_property(struct connman_element *element,
const char *name, int type, const void *value)
{
- struct connman_property *property;
+ GSList *list;
DBG("element %p name %s", element, element->name);
- if (type != DBUS_TYPE_STRING)
+ if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE)
return -EINVAL;
- property = g_try_new0(struct connman_property, 1);
- if (property == NULL)
- return -ENOMEM;
+ __connman_element_lock(element);
- property->flags = CONNMAN_PROPERTY_FLAG_STATIC;
- property->id = CONNMAN_PROPERTY_ID_INVALID;
- property->name = g_strdup(name);
- property->type = type;
+ for (list = element->properties; list; list = list->next) {
+ struct connman_property *property = list->data;
- DBG("name %s type %d value %p", name, type, value);
+ if (g_str_equal(property->name, name) == FALSE)
+ continue;
- switch (type) {
- case DBUS_TYPE_STRING:
- property->value = g_strdup(*((const char **) value));
- break;
+ 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_lock(element);
- element->properties = g_slist_append(element->properties, property);
- connman_element_unlock(element);
+ __connman_element_unlock(element);
+
+ emit_property_changed(connection, element, name, type, value);
return 0;
}
break;
}
- connman_element_lock(element);
+ __connman_element_lock(element);
element->properties = g_slist_append(element->properties, property);
- connman_element_unlock(element);
+ __connman_element_unlock(element);
return 0;
}
DBG("element %p name %s", element, element->name);
- connman_element_lock(element);
+ __connman_element_lock(element);
for (list = element->properties; list; list = list->next) {
property = list->data;
element->properties = g_slist_append(element->properties, property);
unlock:
- connman_element_unlock(element);
+ __connman_element_unlock(element);
return property;
}
{
switch (id) {
case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
- connman_element_lock(element);
+ __connman_element_lock(element);
g_free(element->ipv4.address);
element->ipv4.address = g_strdup(*((const char **) value));
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_IPV4_NETMASK:
- connman_element_lock(element);
+ __connman_element_lock(element);
g_free(element->ipv4.netmask);
element->ipv4.netmask = g_strdup(*((const char **) value));
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_IPV4_GATEWAY:
- connman_element_lock(element);
+ __connman_element_lock(element);
g_free(element->ipv4.gateway);
element->ipv4.gateway = g_strdup(*((const char **) value));
- connman_element_unlock(element);
+ __connman_element_unlock(element);
+ break;
+ case CONNMAN_PROPERTY_ID_IPV4_BROADCAST:
+ __connman_element_lock(element);
+ g_free(element->ipv4.broadcast);
+ element->ipv4.broadcast = g_strdup(*((const char **) value));
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
- connman_element_lock(element);
+ __connman_element_lock(element);
g_free(element->ipv4.nameserver);
element->ipv4.nameserver = g_strdup(*((const char **) value));
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
- connman_element_lock(element);
+ __connman_element_lock(element);
g_free(element->wifi.security);
element->wifi.security = g_strdup(*((const char **) value));
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
- connman_element_lock(element);
+ __connman_element_lock(element);
g_free(element->wifi.passphrase);
element->wifi.passphrase = g_strdup(*((const char **) value));
- connman_element_unlock(element);
+ __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;
}
if (element->ipv4.address == NULL)
return connman_element_get_value(element->parent,
id, value);
- connman_element_lock(element);
+ __connman_element_lock(element);
*((char **) value) = element->ipv4.address;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_IPV4_NETMASK:
if (element->ipv4.netmask == NULL)
return connman_element_get_value(element->parent,
id, value);
- connman_element_lock(element);
+ __connman_element_lock(element);
*((char **) value) = element->ipv4.netmask;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_IPV4_GATEWAY:
if (element->ipv4.gateway == NULL)
return connman_element_get_value(element->parent,
id, value);
- connman_element_lock(element);
+ __connman_element_lock(element);
*((char **) value) = element->ipv4.gateway;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
+ break;
+ 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.broadcast;
+ __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);
+ __connman_element_lock(element);
*((char **) value) = element->ipv4.nameserver;
- connman_element_unlock(element);
+ __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);
+ __connman_element_lock(element);
*((char **) value) = element->wifi.security;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
if (element->wifi.passphrase == NULL)
return connman_element_get_value(element->parent,
id, value);
- connman_element_lock(element);
+ __connman_element_lock(element);
*((char **) value) = element->wifi.passphrase;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
break;
default:
return -EINVAL;
DBG("element %p name %s", element, element->name);
- connman_element_lock(element);
+ __connman_element_lock(element);
for (list = element->properties; list; list = list->next) {
struct connman_property *property = list->data;
continue;
if (g_str_equal(property->name, name) == TRUE) {
- *((char **) value) = property->value;
- found = TRUE;
+ switch (property->type) {
+ case DBUS_TYPE_STRING:
+ *((char **) value) = property->value;
+ found = TRUE;
+ break;
+ }
break;
}
}
- connman_element_unlock(element);
+ __connman_element_unlock(element);
return found;
}
DBG("element %p name %s", element, element->name);
- connman_element_lock(element);
+ __connman_element_lock(element);
for (list = element->properties; list; list = list->next) {
struct connman_property *property = list->data;
}
}
- connman_element_unlock(element);
+ __connman_element_unlock(element);
return found;
}
DBG("element %p name %s", element, element->name);
- connman_element_lock(element);
+ __connman_element_lock(element);
for (list = element->properties; list; list = list->next) {
struct connman_property *property = list->data;
break;
}
- connman_element_unlock(element);
+ __connman_element_unlock(element);
return result;
}
-/**
- * connman_element_register:
- * @element: the element to register
- * @parent: the parent to register the element with
- *
- * Register an element with the core. It will be register under the given
- * parent of if %NULL is provided under the root element.
- *
- * Returns: %0 on success
- */
-int connman_element_register(struct connman_element *element,
- struct connman_element *parent)
+static void append_devices(DBusMessageIter *entry)
{
- DBG("element %p name %s parent %p", element, element->name, parent);
+ DBusMessageIter value, iter;
+ const char *key = "Devices";
- 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);
- return -EPERM;
- }
- }
+ dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
- if (connman_element_ref(element) == NULL)
- return -EINVAL;
+ dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
- connman_element_lock(element);
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
+ dbus_message_iter_close_container(&value, &iter);
- if (element->name == NULL) {
- element->name = g_strdup(type2string(element->type));
- if (element->name == NULL) {
- connman_element_unlock(element);
- return -EINVAL;
- }
- }
+ dbus_message_iter_close_container(entry, &value);
+}
- element->parent = parent;
+static void emit_devices_signal(DBusConnection *conn)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry;
- connman_element_unlock(element);
+ DBG("conn %p", conn);
- if (thread_register != NULL)
- g_thread_pool_push(thread_register, element, NULL);
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
- return 0;
+ dbus_message_iter_init_append(signal, &entry);
+
+ append_devices(&entry);
+
+ g_dbus_send_message(conn, signal);
}
-void connman_element_unregister(struct connman_element *element)
+static void emit_networks_signal(DBusConnection *conn,
+ struct connman_element *device)
{
- DBG("element %p name %s", element, element->name);
+ DBusMessage *signal;
+ DBusMessageIter entry;
+
+ DBG("conn %p", conn);
+
+ if (device == NULL)
+ return;
- if (thread_unregister != NULL)
- g_thread_pool_push(thread_unregister, element, NULL);
+ 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);
}
-void connman_element_unregister_children(struct connman_element *element)
+static void append_connections(DBusMessageIter *entry)
{
- DBG("element %p name %s", element, element->name);
+ DBusMessageIter value, iter;
+ const char *key = "Connections";
+
+ 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(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
+ dbus_message_iter_close_container(&value, &iter);
- if (thread_unregister_children != NULL)
- g_thread_pool_push(thread_unregister_children, element, NULL);
+ dbus_message_iter_close_container(entry, &value);
}
-static gboolean update_element(GNode *node, gpointer user_data)
+static void emit_connections_signal(DBusConnection *conn)
{
- struct connman_element *element = node->data;
+ DBusMessage *signal;
+ DBusMessageIter entry;
- DBG("element %p name %s", element, element->name);
+ DBG("conn %p", conn);
- if (element->driver && element->driver->update)
- element->driver->update(element);
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
+ dbus_message_iter_init_append(signal, &entry);
- return FALSE;
+ append_connections(&entry);
+
+ g_dbus_send_message(conn, signal);
}
-void connman_element_update(struct connman_element *element)
+static void append_state(DBusMessageIter *entry, const char *state)
{
- GNode *node;
+ DBusMessageIter value;
+ const char *key = "State";
- DBG("element %p name %s", element, element->name);
+ dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
- g_static_rw_lock_reader_lock(&element_lock);
+ 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);
+}
- node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
+static void emit_state_change(DBusConnection *conn, const char *state)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry;
- if (node != NULL)
- g_node_traverse(node, G_PRE_ORDER,
- G_TRAVERSE_ALL, -1, update_element, NULL);
+ DBG("conn %p", conn);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
- g_static_rw_lock_reader_unlock(&element_lock);
+ dbus_message_iter_init_append(signal, &entry);
+
+ append_state(&entry, state);
+
+ g_dbus_send_message(conn, signal);
}
-int connman_element_set_enabled(struct connman_element *element,
- gboolean enabled)
+static void set_signal_strength(struct connman_element *connection)
{
- if (element->enabled == enabled)
- return 0;
-
- element->enabled = enabled;
+ struct connman_element *element = connection;
- connman_element_update(element);
+ while (element != NULL) {
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
+ connection->strength = element->strength;
+ break;
+ }
- return 0;
+ element = element->parent;
+ }
}
static void register_element(gpointer data, gpointer user_data)
GSList *list;
GNode *node;
- g_static_rw_lock_writer_lock(&element_lock);
-
- connman_element_lock(element);
+ __connman_element_lock(element);
if (element->parent) {
node = g_node_find(element_root, G_PRE_ORDER,
set_reference_properties(element);
- connman_element_unlock(element);
+ __connman_element_unlock(element);
DBG("element %p path %s", element, element->path);
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) {
+ 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) {
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) {
NULL, element, NULL) == FALSE)
connman_error("Failed to register %s connection",
element->path);
+ else {
+ set_signal_strength(element);
+ 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;
DBG("driver %p name %s", driver, driver->name);
if (driver->probe(element) == 0) {
- connman_element_lock(element);
+ __connman_element_lock(element);
element->driver = driver;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
+
+ enable_element(element);
break;
}
}
+}
+
+/**
+ * connman_element_register:
+ * @element: the element to register
+ * @parent: the parent to register the element with
+ *
+ * Register an element with the core. It will be register under the given
+ * parent of if %NULL is provided under the root element.
+ *
+ * Returns: %0 on success
+ */
+int connman_element_register(struct connman_element *element,
+ struct connman_element *parent)
+{
+ 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 &&
+ element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) {
+ if (g_pattern_match_simple(device_filter,
+ element->devname) == FALSE) {
+ DBG("ignoring %s [%s] device", element->name,
+ element->devname);
+ return -EPERM;
+ }
+ }
+
+ if (connman_element_ref(element) == NULL)
+ return -EINVAL;
+
+ __connman_element_lock(element);
+
+ if (element->name == NULL) {
+ element->name = g_strdup(type2string(element->type));
+ if (element->name == NULL) {
+ __connman_element_unlock(element);
+ return -EINVAL;
+ }
+ }
+
+ element->parent = parent;
+
+ __connman_element_unlock(element);
+
+ register_element(element, NULL);
- g_static_rw_lock_writer_unlock(&element_lock);
+ return 0;
}
static gboolean remove_element(GNode *node, gpointer user_data)
return FALSE;
if (element->driver) {
+ disable_element(element);
+
if (element->driver->remove)
element->driver->remove(element);
- connman_element_lock(element);
+ __connman_element_lock(element);
element->driver = NULL;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
}
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) {
+ if (__connman_element_count(NULL,
+ CONNMAN_ELEMENT_TYPE_CONNECTION) == 0)
+ emit_state_change(connection, "offline");
+ emit_connections_signal(connection);
- if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION)
g_dbus_unregister_interface(connection, element->path,
CONNMAN_CONNECTION_INTERFACE);
+ }
+
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
+ emit_networks_signal(connection, element->parent);
- 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);
- if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE)
g_dbus_unregister_interface(connection, element->path,
CONNMAN_DEVICE_INTERFACE);
-
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_ELEMENT_INTERFACE);
+ }
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);
}
-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);
+}
+
+static gboolean update_element(GNode *node, gpointer user_data)
+{
+ struct connman_element *element = node->data;
+ struct connman_element *root = user_data;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (element->driver && element->driver->update)
+ element->driver->update(element);
+
+ if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION &&
+ root->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
+ if (element->strength != root->strength) {
+ element->strength = root->strength;
+ emit_property_changed(connection, element, "Strength",
+ DBUS_TYPE_BYTE, &element->strength);
+ }
+ }
+
+ return FALSE;
+}
+
+void connman_element_update(struct connman_element *element)
+{
+ GNode *node;
+
+ DBG("element %p name %s", element, element->name);
+
+ 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, element);
+}
+
+int connman_element_set_enabled(struct connman_element *element,
+ gboolean enabled)
+{
+ if (element->enabled == enabled)
+ return 0;
+
+ element->enabled = enabled;
+
+ emit_enabled_signal(connection, element);
- g_static_rw_lock_writer_unlock(&element_lock);
+ return 0;
+}
+
+int connman_element_set_scanning(struct connman_element *element,
+ gboolean scanning)
+{
+ if (element->scanning == scanning)
+ return 0;
+
+ element->scanning = scanning;
+
+ emit_scanning_signal(connection, element);
+
+ return 0;
}
int __connman_element_init(DBusConnection *conn, const char *device)
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);
-
- thread_register = g_thread_pool_new(register_element,
- NULL, 1, FALSE, NULL);
- thread_unregister = g_thread_pool_new(unregister_element,
- NULL, 1, FALSE, NULL);
- thread_unregister_children = g_thread_pool_new(unregister_children,
- NULL, 1, FALSE, NULL);
-
__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_element_lock(element);
+ __connman_element_lock(element);
element->driver = NULL;
- connman_element_unlock(element);
+ __connman_element_unlock(element);
}
return FALSE;
DBG("element %p name %s", element, element->name);
if (g_node_depth(node) > 1)
- g_thread_pool_push(thread_unregister, element, NULL);
+ connman_element_unregister(element);
return FALSE;
}
__connman_device_cleanup();
- g_thread_pool_free(thread_register, TRUE, TRUE);
- thread_register = NULL;
-
- 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_thread_pool_free(thread_unregister, FALSE, TRUE);
- thread_unregister = NULL;
-
- g_thread_pool_free(thread_unregister_children, FALSE, TRUE);
- thread_unregister_children = NULL;
- 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