Indicate when signal strength of connection changes

[connman] / src / element.c

diff --git a/src/element.c b/src/element.c
index e082229..72f4026 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -422,10 +422,6 @@ static void append_networks(struct connman_element *element,
        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,
@@ -476,12 +472,13 @@ static DBusMessage *device_get_properties(DBusConnection *conn,
        connman_dbus_dict_append_variant(&dict, "Powered",
                                        DBUS_TYPE_BOOLEAN, &element->enabled);
 
-       dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
+       if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
+                       element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX) {
+               dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
                                                                NULL, &entry);
-
-       append_networks(element, &entry);
-
-       dbus_message_iter_close_container(&dict, &entry);
+               append_networks(element, &entry);
+               dbus_message_iter_close_container(&dict, &entry);
+       }
 
        add_common_properties(element, &dict);
 
@@ -682,12 +679,13 @@ static DBusMessage *network_set_property(DBusConnection *conn,
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *get_connection_properties(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);
 
@@ -702,6 +700,16 @@ static DBusMessage *get_connection_properties(DBusConnection *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->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
+                       element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX)
+               connman_dbus_dict_append_variant(&dict, "Strength",
+                                       DBUS_TYPE_BYTE, &element->strength);
+
        add_common_properties(element, &dict);
 
        dbus_message_iter_close_container(&array, &dict);
@@ -727,7 +735,7 @@ static GDBusMethodTable network_methods[] = {
 };
 
 static GDBusMethodTable connection_methods[] = {
-       { "GetProperties", "",   "a{sv}", get_connection_properties },
+       { "GetProperties", "",   "a{sv}", connection_get_properties },
        { },
 };
 
@@ -1131,6 +1139,9 @@ static void emit_property_changed(DBusConnection *conn,
        case CONNMAN_ELEMENT_TYPE_NETWORK:
                iface = CONNMAN_NETWORK_INTERFACE;
                break;
+       case CONNMAN_ELEMENT_TYPE_CONNECTION:
+               iface = CONNMAN_CONNECTION_INTERFACE;
+               break;
        default:
                return;
        }
@@ -1736,6 +1747,20 @@ static void emit_state_change(DBusConnection *conn, const char *state)
        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 register_element(gpointer data, gpointer user_data)
 {
        struct connman_element *element = data;
@@ -1802,6 +1827,7 @@ static void register_element(gpointer data, gpointer user_data)
                        connman_error("Failed to register %s connection",
                                                                element->path);
                else {
+                       set_signal_strength(element);
                        emit_connections_signal(connection);
                        emit_state_change(connection, "online");
                }
@@ -1961,12 +1987,22 @@ void connman_element_unregister_children(struct connman_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;
 }
 
@@ -1980,7 +2016,7 @@ void connman_element_update(struct connman_element *element)
 
        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,