*
* Connection Manager
*
- * Copyright (C) 2007 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include "connman.h"
-static const char *master_state = "unknown";
-
-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 DBusMessage *get_state(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void append_devices(DBusMessageIter *dict)
{
- DBusMessage *reply;
+ DBusMessageIter entry, value, iter;
+ const char *key = "Devices";
- 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_append_args(reply, DBUS_TYPE_STRING, &master_state,
- DBUS_TYPE_INVALID);
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
- return reply;
+ 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 *register_agent(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void append_connections(DBusMessageIter *dict)
{
- DBusMessage *reply;
- const char *sender, *path;
+ DBusMessageIter entry, value, iter;
+ const char *key = "Connections";
- DBG("conn %p", conn);
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
- sender = dbus_message_get_sender(msg);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
- dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
- __connman_agent_register(sender, path);
+ dbus_message_iter_close_container(&value, &iter);
- return reply;
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
}
-static DBusMessage *unregister_agent(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void append_state(DBusMessageIter *dict, const char *state)
{
- DBusMessage *reply;
- const char *sender, *path;
+ DBusMessageIter entry, value;
+ const char *key = "State";
- DBG("conn %p", conn);
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
- sender = dbus_message_get_sender(msg);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
- dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_STRING_AS_STRING, &value);
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &state);
- __connman_agent_unregister(sender, path);
+ dbus_message_iter_close_container(&entry, &value);
- return reply;
+ dbus_message_iter_close_container(dict, &entry);
}
-static GDBusMethodTable manager_methods[] = {
- { "ListInterfaces", "", "ao", list_interfaces },
- { "GetState", "", "s", get_state },
- { "RegisterAgent", "o", "", register_agent },
- { "UnregisterAgent", "o", "", unregister_agent },
- { },
-};
-
-static GDBusSignalTable manager_signals[] = {
- { "InterfaceAdded", "o" },
- { "InterfaceRemoved", "o" },
- { "StateChanged", "s" },
- { },
-};
-
-static DBusMessage *activate_device(DBusConnection *conn,
+static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- const char *path;
+ DBusMessageIter array, dict;
DBG("conn %p", conn);
- dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
-
- DBG("device %s", path);
-
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ 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
+ append_state(&dict, "offline");
+
+ dbus_message_iter_close_container(&array, &dict);
return reply;
}
-static DBusMessage *set_wireless(DBusConnection *conn,
+static DBusMessage *register_agent(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- dbus_bool_t enabled;
+ const char *sender, *path;
DBG("conn %p", conn);
- dbus_message_get_args(msg, NULL, DBUS_TYPE_BOOLEAN, &enabled,
+ sender = dbus_message_get_sender(msg);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID);
reply = dbus_message_new_method_return(msg);
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ __connman_agent_register(sender, path);
+
return reply;
}
-static DBusMessage *get_wireless(DBusConnection *conn,
+static DBusMessage *unregister_agent(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- dbus_bool_t enabled = TRUE;
+ const char *sender, *path;
DBG("conn %p", conn);
+ sender = dbus_message_get_sender(msg);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID);
+
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
- dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &enabled,
- DBUS_TYPE_INVALID);
+ dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+ __connman_agent_unregister(sender, path);
return reply;
}
-static DBusMessage *do_sleep(DBusConnection *conn,
+static GDBusMethodTable manager_methods[] = {
+ { "GetProperties", "", "a{sv}", get_properties },
+ { "RegisterAgent", "o", "", register_agent },
+ { "UnregisterAgent", "o", "", unregister_agent },
+ { },
+};
+
+static GDBusSignalTable manager_signals[] = {
+ { "PropertyChanged", "sv" },
+ { },
+};
+
+static DBusMessage *nm_sleep(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
return reply;
}
-static DBusMessage *do_wake(DBusConnection *conn,
+static DBusMessage *nm_wake(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
NM_STATE_DISCONNECTED
};
-static DBusMessage *do_state(DBusConnection *conn,
+static DBusMessage *nm_state(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- dbus_uint32_t state = NM_STATE_DISCONNECTED;
+ dbus_uint32_t state;
DBG("conn %p", conn);
if (reply == NULL)
return NULL;
+ state = NM_STATE_DISCONNECTED;
+
dbus_message_append_args(reply, DBUS_TYPE_UINT32, &state,
DBUS_TYPE_INVALID);
}
static GDBusMethodTable nm_methods[] = {
- { "getDevices", "", "ao", list_interfaces },
- { "setActiveDevice", "o", "", activate_device },
- { "setWirelessEnabled", "b", "", set_wireless },
- { "getWirelessEnabled", "", "b", get_wireless },
- { "sleep", "", "", do_sleep },
- { "wake", "", "", do_wake },
- { "state", "", "u", do_state },
+ { "sleep", "", "", nm_sleep },
+ { "wake", "", "", nm_wake },
+ { "state", "", "u", nm_state },
{ },
};
static DBusConnection *connection = NULL;
-static int nm_compat = 0;
+static gboolean nm_compat = FALSE;
-int __connman_manager_init(DBusConnection *conn, int compat)
+int __connman_manager_init(DBusConnection *conn, gboolean compat)
{
DBG("conn %p", conn);
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);
-
- if (compat) {
- g_dbus_register_object(connection, NM_PATH, NULL, NULL);
+ CONNMAN_MANAGER_INTERFACE,
+ manager_methods,
+ manager_signals, NULL, NULL, NULL);
+ if (compat == TRUE) {
g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
- nm_methods, NULL, NULL);
+ nm_methods, NULL, NULL, NULL, NULL);
- nm_compat = 1;
+ nm_compat = TRUE;
}
return 0;
{
DBG("conn %p", connection);
- if (nm_compat) {
+ 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