#include "connman.h"
-static DBusMessage *list_interfaces(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void append_profiles(DBusMessageIter *dict)
{
- DBusMessage *reply;
- DBusMessageIter array, iter;
+ DBusMessageIter entry, value, iter;
+ const char *key = "Profiles";
- DBG("conn %p", conn);
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
- dbus_message_iter_init_append(reply, &array);
+ 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(&array, DBUS_TYPE_ARRAY,
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_iface_list(&iter);
+ __connman_profile_list(&iter);
- dbus_message_iter_close_container(&array, &iter);
+ dbus_message_iter_close_container(&value, &iter);
- return reply;
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
+static void append_devices(DBusMessageIter *dict)
+{
+ DBusMessageIter entry, value, iter;
+ const char *key = "Devices";
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_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_DEVICE, &iter);
+
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
}
-static DBusMessage *get_state(DBusConnection *conn,
+static void append_connections(DBusMessageIter *dict)
+{
+ DBusMessageIter entry, value, iter;
+ const char *key = "Connections";
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_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);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
+static void append_state(DBusMessageIter *dict, const char *state)
+{
+ DBusMessageIter entry, value;
+ const char *key = "State";
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_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);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
+static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- const char *state;
+ DBusMessageIter array, dict;
DBG("conn %p", conn);
if (reply == NULL)
return NULL;
- if (__connman_iface_is_connected() == TRUE)
- state = "online";
+ 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);
+
+ append_profiles(&dict);
+
+ append_devices(&dict);
+ append_connections(&dict);
+
+ if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
+ append_state(&dict, "online");
else
- state = "offline";
+ append_state(&dict, "offline");
- dbus_message_append_args(reply, DBUS_TYPE_STRING, &state,
- DBUS_TYPE_INVALID);
+ dbus_message_iter_close_container(&array, &dict);
return reply;
}
}
static GDBusMethodTable manager_methods[] = {
- { "ListInterfaces", "", "ao", list_interfaces },
- { "GetState", "", "s", get_state },
- { "RegisterAgent", "o", "", register_agent },
- { "UnregisterAgent", "o", "", unregister_agent },
+ { "GetProperties", "", "a{sv}", get_properties },
+ { "RegisterAgent", "o", "", register_agent },
+ { "UnregisterAgent", "o", "", unregister_agent },
{ },
};
static GDBusSignalTable manager_signals[] = {
- { "InterfaceAdded", "o" },
- { "InterfaceRemoved", "o" },
- { "StateChanged", "s" },
+ { "PropertyChanged", "sv" },
{ },
};
if (reply == NULL)
return NULL;
- if (__connman_iface_is_connected() == TRUE)
- state = NM_STATE_CONNECTED;
- else
- state = NM_STATE_DISCONNECTED;
+ state = NM_STATE_DISCONNECTED;
dbus_message_append_args(reply, DBUS_TYPE_UINT32, &state,
DBUS_TYPE_INVALID);
}
static GDBusMethodTable nm_methods[] = {
- { "sleep", "", "", nm_sleep },
- { "wake", "", "", nm_wake },
- { "state", "", "u", nm_state },
+ { "sleep", "", "", nm_sleep },
+ { "wake", "", "", nm_wake },
+ { "state", "", "u", nm_state },
{ },
};
if (connection == NULL)
return -1;
- g_dbus_register_object(connection, CONNMAN_MANAGER_PATH, NULL, NULL);
-
g_dbus_register_interface(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE,
- manager_methods,
- manager_signals, NULL);
+ CONNMAN_MANAGER_INTERFACE,
+ manager_methods,
+ manager_signals, NULL, NULL, NULL);
if (compat == TRUE) {
- g_dbus_register_object(connection, NM_PATH, NULL, NULL);
-
g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
- nm_methods, NULL, NULL);
+ nm_methods, NULL, NULL, NULL, NULL);
nm_compat = TRUE;
}
if (nm_compat == TRUE) {
g_dbus_unregister_interface(connection, NM_PATH, NM_INTERFACE);
-
- g_dbus_unregister_object(connection, NM_PATH);
}
g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE);
- g_dbus_unregister_object(connection, CONNMAN_MANAGER_PATH);
-
dbus_connection_unref(connection);
}
projects / connman / blobdiff