Add support for async service connect and timeout handling

[connman] / src / agent.c

diff --git a/src/agent.c b/src/agent.c
index d3a2746..5ae62b2 100644 (file)
--- a/src/agent.c
+++ b/src/agent.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  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
@@ -23,30 +23,103 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdbus.h>
+
 #include "connman.h"
 
-int __connman_agent_init(void)
+static DBusConnection *connection = NULL;
+static guint agent_watch = 0;
+static gchar *agent_path = NULL;
+static gchar *agent_sender = NULL;
+
+static void agent_free(void)
 {
-       DBG("");
+       agent_watch = 0;
 
-       return 0;
+       g_free(agent_sender);
+       agent_sender = NULL;
+
+       g_free(agent_path);
+       agent_path = NULL;
 }
 
-void __connman_agent_cleanup(void)
+static void agent_disconnect(DBusConnection *connection, void *data)
+{
+       DBG("data %p", data);
+
+       agent_free();
+}
+
+int __connman_agent_register(const char *sender, const char *path)
 {
-       DBG("");
+       DBG("sender %s path %s", sender, path);
+
+       if (agent_path != NULL)
+               return -EEXIST;
+
+       agent_sender = g_strdup(sender);
+       agent_path = g_strdup(path);
+
+       agent_watch = g_dbus_add_disconnect_watch(connection, sender,
+                                               agent_disconnect, NULL, NULL);
+
+       return 0;
 }
 
-int __connman_agent_register(const char *path)
+int __connman_agent_unregister(const char *sender, const char *path)
 {
-       DBG("");
+       DBG("sender %s path %s", sender, path);
+
+       if (agent_path == NULL)
+               return -ENOENT;
+
+       if (agent_watch > 0)
+               g_dbus_remove_watch(connection, agent_watch);
+
+       agent_free();
 
        return 0;
 }
 
-int __connman_agent_unregister(const char *path)
+int __connman_agent_init(DBusConnection *conn)
 {
-       DBG("");
+       DBG("conn %p", conn);
+
+       connection = dbus_connection_ref(conn);
+       if (connection == NULL)
+               return -1;
 
        return 0;
 }
+
+void __connman_agent_cleanup(void)
+{
+       DBusMessage *msg;
+
+       DBG("conn %p", connection);
+
+       if (agent_watch > 0)
+               g_dbus_remove_watch(connection, agent_watch);
+
+       if (agent_path == NULL)
+               return;
+
+       msg = dbus_message_new_method_call(agent_sender, agent_path,
+                                       CONNMAN_AGENT_INTERFACE, "Release");
+       if (msg == NULL)
+               return;
+
+       dbus_message_set_no_reply(msg, TRUE);
+
+       dbus_connection_send(connection, msg, NULL);
+
+       dbus_message_unref(msg);
+
+       agent_free();
+
+       dbus_connection_unref(connection);
+}