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);
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,
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);
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);
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);
};
static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", get_connection_properties },
+ { "GetProperties", "", "a{sv}", connection_get_properties },
{ },
};
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)
{
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);
dbus_message_iter_close_container(entry, &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);
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 register_element(gpointer data, gpointer user_data)
{
struct connman_element *element = data;
connman_error("Failed to register %s connection",
element->path);
else {
+ set_signal_strength(element);
emit_connections_signal(connection);
emit_state_change(connection, "online");
}
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,
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,
projects / connman / blobdiff