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" },
return "bootp";
case CONNMAN_ELEMENT_TYPE_ZEROCONF:
return "zeroconf";
- case CONNMAN_ELEMENT_TYPE_RESOLVER:
- return "resolver";
case CONNMAN_ELEMENT_TYPE_CONNECTION:
return "connection";
}
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_AUTO:
+ return "auto";
case CONNMAN_ELEMENT_POLICY_ASK:
return "ask";
}
enum connman_element_policy __connman_element_string2policy(const char *policy)
{
- if (strcasecmp(policy, "off") == 0)
- return CONNMAN_ELEMENT_POLICY_OFF;
- else if (strcasecmp(policy, "ignore") == 0)
+ if (strcasecmp(policy, "ignore") == 0)
return CONNMAN_ELEMENT_POLICY_IGNORE;
else if (strcasecmp(policy, "auto") == 0)
return CONNMAN_ELEMENT_POLICY_AUTO;
iface = CONNMAN_NETWORK_INTERFACE;
key = "Connected";
break;
+ case CONNMAN_ELEMENT_TYPE_CONNECTION:
+ iface = CONNMAN_CONNECTION_INTERFACE;
+ key = "Default";
+ break;
default:
return;
}
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)
+static void emit_scanning_signal(DBusConnection *conn,
+ struct connman_element *element)
{
- struct connman_element *element = data;
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *key = "Scanning";
DBG("conn %p", conn);
- if (element->enabled == FALSE)
- return __connman_error_failed(msg);
+ if (element == NULL)
+ return;
- if (element->driver && element->driver->update) {
- DBG("Calling update callback");
- if (element->driver->update(element) < 0)
- return __connman_error_failed(msg);
+ if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
+ return;
- }
+ signal = dbus_message_new_signal(element->path,
+ CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ 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);
+
+ g_dbus_send_message(conn, signal);
}
static DBusMessage *do_enable(DBusConnection *conn,
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static void append_networks(struct connman_element *element,
- DBusMessageIter *entry)
-{
- DBusMessageIter value, iter;
- const char *key = "Networks";
-
- if (element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIFI &&
- element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIMAX)
- return;
-
- 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 *device_get_properties(DBusConnection *conn,
+static DBusMessage *network_get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
DBusMessage *reply;
- DBusMessageIter array, dict, entry;
- const char *str;
+ DBusMessageIter array, dict;
DBG("conn %p", conn);
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);
+ 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, "Powered",
+ connman_dbus_dict_append_variant(&dict, "Connected",
DBUS_TYPE_BOOLEAN, &element->enabled);
- dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
-
- append_networks(element, &entry);
-
- dbus_message_iter_close_container(&dict, &entry);
+ connman_dbus_dict_append_variant(&dict, "Remember",
+ DBUS_TYPE_BOOLEAN, &element->remember);
add_common_properties(element, &dict);
return reply;
}
-static DBusMessage *device_set_property(DBusConnection *conn,
+static DBusMessage *network_set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
- DBusMessageIter iter, value;
+ DBusMessageIter iter;
+ DBusMessageIter value;
const char *name;
DBG("conn %p", conn);
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 (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;
- if (powered == TRUE)
- do_enable(conn, msg, data);
- else
- do_disable(conn, msg, data);
+ 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);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static int parse_network_dict(DBusMessageIter *iter, const char **ssid,
- const char **security, const char **passphrase)
-{
- while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
-
- dbus_message_iter_recurse(iter, &entry);
- dbus_message_iter_get_basic(&entry, &key);
-
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
-
- switch (dbus_message_iter_get_arg_type(&value)) {
- case DBUS_TYPE_STRING:
- if (g_str_equal(key, "WiFi.SSID") == TRUE)
- dbus_message_iter_get_basic(&value, ssid);
- else if (g_str_equal(key, "WiFi.Security") == TRUE)
- dbus_message_iter_get_basic(&value, security);
- else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
- dbus_message_iter_get_basic(&value, passphrase);
- break;
- }
-
- dbus_message_iter_next(iter);
- }
-
- return 0;
-}
-
-static DBusMessage *device_create_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- struct connman_element *network;
- DBusMessageIter iter, array;
- const char *ssid = NULL, *security = NULL, *passphrase = NULL;
-
- DBG("conn %p", conn);
-
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_recurse(&iter, &array);
- parse_network_dict(&array, &ssid, &security, &passphrase);
- if (ssid == NULL)
- return __connman_error_invalid_arguments(msg);
-
- DBG("ssid %s security %s passphrase %s", ssid, security, passphrase);
-
- network = connman_element_create(ssid);
-
- network->type = CONNMAN_ELEMENT_TYPE_NETWORK;
- network->index = element->index;
-
- network->remember = TRUE;
-
- connman_element_add_static_property(network, "Name",
- DBUS_TYPE_STRING, &ssid);
-
- connman_element_add_static_array_property(element, "WiFi.SSID",
- DBUS_TYPE_BYTE, &ssid, strlen(ssid));
-
- network->wifi.security = g_strdup(security);
- network->wifi.passphrase = g_strdup(passphrase);
-
- connman_element_register(network, element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &network->path,
- DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *device_remove_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *network_get_properties(DBusConnection *conn,
+static DBusMessage *connection_get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- str = __connman_element_policy2string(element->policy);
+ str = subtype2string(element->subtype);
if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Policy",
+ connman_dbus_dict_append_variant(&dict, "Type",
DBUS_TYPE_STRING, &str);
- connman_dbus_dict_append_variant(&dict, "Available",
- DBUS_TYPE_BOOLEAN, &element->available);
+ 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, "Connected",
+ connman_dbus_dict_append_variant(&dict, "Default",
DBUS_TYPE_BOOLEAN, &element->enabled);
- connman_dbus_dict_append_variant(&dict, "Remember",
- DBUS_TYPE_BOOLEAN, &element->remember);
-
add_common_properties(element, &dict);
dbus_message_iter_close_container(&array, &dict);
return reply;
}
-static DBusMessage *network_set_property(DBusConnection *conn,
+static DBusMessage *connection_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);
if (__connman_security_check_privileges(msg) < 0)
return __connman_error_permission_denied(msg);
- if (g_str_equal(name, "Remember") == TRUE) {
- dbus_message_iter_get_basic(&value, &element->remember);
- } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
- const char *str;
+ if (g_str_equal(name, "Default") == TRUE) {
+ dbus_bool_t enabled;
- 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);
+ dbus_message_iter_get_basic(&value, &enabled);
- __connman_element_store(element);
+ 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 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 GDBusMethodTable device_methods[] = {
- { "GetProperties", "", "a{sv}", device_get_properties },
- { "SetProperty", "sv", "", device_set_property },
- { "CreateNetwork", "a{sv}", "o", device_create_network },
- { "RemoveNetwork", "o", "", device_remove_network },
- { "ProposeScan", "", "", do_update },
- { },
-};
-
static GDBusMethodTable network_methods[] = {
{ "GetProperties", "", "a{sv}", network_get_properties },
{ "SetProperty", "sv", "", network_set_property },
};
static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", get_connection_properties },
+ { "GetProperties", "", "a{sv}", connection_get_properties },
+ { "SetProperty", "sv", "", connection_set_property },
{ },
};
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_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.broadcast);
g_free(element->ipv4.nameserver);
g_free(element->devname);
+ g_free(element->devpath);
g_free(element->path);
g_free(element->name);
g_free(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)
+{
+ 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);
+
+ emit_property_changed(connection, element, name, type, value);
+
+ 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_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);
g_free(element->ipv4.nameserver);
*((char **) value) = element->ipv4.gateway;
__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,
return result;
}
-static void append_devices(DBusMessageIter *entry)
+static void append_networks(struct connman_element *element,
+ DBusMessageIter *entry)
{
DBusMessageIter value, iter;
- const char *key = "Devices";
+ const char *key = "Networks";
dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
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);
-
+ __connman_element_list(element, CONNMAN_ELEMENT_TYPE_NETWORK, &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 emit_networks_signal(DBusConnection *conn,
struct connman_element *device)
{
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);
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 set_signal_strength(struct connman_element *connection)
+{
+ struct connman_element *element = connection;
+
+ while (element != NULL) {
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
+ connection->strength = element->strength;
+ break;
+ }
+
+ element = element->parent;
+ }
+}
+
+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);
+
+ enable_element(element);
+ break;
+ }
+ }
+}
+
static void register_element(gpointer data, gpointer user_data)
{
struct connman_element *element = data;
const gchar *basepath;
- GSList *list;
GNode *node;
__connman_element_lock(element);
g_node_append_data(node, element);
- 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,
connman_error("Failed to register %s connection",
element->path);
else {
+ set_signal_strength(element);
emit_connections_signal(connection);
emit_state_change(connection, "online");
}
__connman_element_store(element);
- 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);
+ if (started == FALSE)
+ return;
- enable_element(element);
- break;
- }
- }
+ probe_element(element);
}
/**
if (element->devname == NULL)
element->devname = g_strdup(element->name);
- if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) {
+ 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,
if (element == root)
return FALSE;
+ if (node != NULL)
+ g_node_unlink(node);
+
if (element->driver) {
disable_element(element);
__connman_element_unlock(element);
}
- if (node != NULL) {
- g_node_unlink(node);
+ if (node != NULL)
g_node_destroy(node);
- }
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_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);
- }
-
connman_element_unref(element);
return FALSE;
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;
}
if (node != NULL)
g_node_traverse(node, G_PRE_ORDER,
- G_TRAVERSE_ALL, -1, update_element, NULL);
+ G_TRAVERSE_ALL, -1, update_element, element);
}
int connman_element_set_enabled(struct connman_element *element,
element->enabled = enabled;
- connman_element_update(element);
+ emit_enabled_signal(connection, element);
+
+ 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;
}
element_root = g_node_new(element);
__connman_device_init();
+ __connman_network_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_detect_init();
+}
+
+void __connman_element_stop(void)
+{
+ DBG("");
+
+ __connman_detect_cleanup();
+}
+
static gboolean free_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
{
DBG("");
+ __connman_network_cleanup();
__connman_device_cleanup();
g_node_traverse(element_root, G_POST_ORDER, G_TRAVERSE_ALL, -1,
projects / connman / blobdiff