Fix breakage caused by libgdbus API change

[connman] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 5fa60cc..7de3668 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -2,7 +2,7 @@
  *
  *  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
@@ -27,9 +27,190 @@
 
 #include "connman.h"
 
+static DBusMessage *list_interfaces(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       DBusMessageIter array, iter;
+
+       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_TYPE_OBJECT_PATH_AS_STRING, &iter);
+
+       __connman_iface_list(&iter);
+
+       dbus_message_iter_close_container(&array, &iter);
+
+       return reply;
+}
+
+static DBusMessage *get_state(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       const char *state;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       if (__connman_iface_is_connected() == TRUE)
+               state = "online";
+       else
+               state = "offline";
+
+       dbus_message_append_args(reply, DBUS_TYPE_STRING, &state,
+                                                       DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+static DBusMessage *register_agent(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       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_INVALID);
+
+       __connman_agent_register(sender, path);
+
+       return reply;
+}
+
+static DBusMessage *unregister_agent(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       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_INVALID);
+
+       __connman_agent_unregister(sender, path);
+
+       return reply;
+}
+
+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 *nm_sleep(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+static DBusMessage *nm_wake(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+enum {
+       NM_STATE_UNKNOWN = 0,
+       NM_STATE_ASLEEP,
+       NM_STATE_CONNECTING,
+       NM_STATE_CONNECTED,
+       NM_STATE_DISCONNECTED
+};
+
+static DBusMessage *nm_state(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       dbus_uint32_t state;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       if (__connman_iface_is_connected() == TRUE)
+               state = NM_STATE_CONNECTED;
+       else
+               state = NM_STATE_DISCONNECTED;
+
+       dbus_message_append_args(reply, DBUS_TYPE_UINT32, &state,
+                                                       DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+static GDBusMethodTable nm_methods[] = {
+       { "sleep", "",  "",   nm_sleep        },
+       { "wake",  "",  "",   nm_wake         },
+       { "state", "",  "u",  nm_state        },
+       { },
+};
+
 static DBusConnection *connection = NULL;
+static gboolean nm_compat = FALSE;
 
-int __connman_manager_init(DBusConnection *conn)
+int __connman_manager_init(DBusConnection *conn, gboolean compat)
 {
        DBG("conn %p", conn);
 
@@ -37,7 +218,17 @@ int __connman_manager_init(DBusConnection *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, NULL, NULL);
+
+       if (compat == TRUE) {
+               g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
+                                       nm_methods, NULL, NULL, NULL, NULL);
+
+               nm_compat = TRUE;
+       }
 
        return 0;
 }
@@ -46,7 +237,12 @@ void __connman_manager_cleanup(void)
 {
        DBG("conn %p", connection);
 
-       g_dbus_unregister_object(connection, CONNMAN_MANAGER_PATH);
+       if (nm_compat == TRUE) {
+               g_dbus_unregister_interface(connection, NM_PATH, NM_INTERFACE);
+       }
+
+       g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
+                                               CONNMAN_MANAGER_INTERFACE);
 
        dbus_connection_unref(connection);
 }