dundee: Add Manager interface

diff --git a/Makefile.am b/Makefile.am
index 31e0110..00e1118 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -689,7 +689,8 @@ sbin_PROGRAMS += dundee/dundee
 
 dundee_dundee_SOURCES = $(gdbus_sources) \
                        src/log.c src/dbus.c \
-                       dundee/dundee.h dundee/main.c dundee/dbus.c
+                       dundee/dundee.h dundee/main.c dundee/dbus.c \
+                       dundee/manager.c
 
 dundee_dundee_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
 

diff --git a/dundee/dundee.h b/dundee/dundee.h
index c972af0..3050baf 100644 (file)
--- a/dundee/dundee.h
+++ b/dundee/dundee.h
@@ -39,6 +39,8 @@ void __ofono_log_enable(struct ofono_debug_desc *start,
 #include <ofono/dbus.h>
 
 #define DUNDEE_SERVICE                 "org.ofono.dundee"
+#define DUNDEE_MANAGER_INTERFACE       "org.ofono.dundee.Manager"
+#define DUNDEE_MANAGER_PATH            "/"
 
 int __ofono_dbus_init(DBusConnection *conn);
 void __ofono_dbus_cleanup(void);
@@ -47,3 +49,7 @@ void __ofono_dbus_pending_reply(DBusMessage **msg, DBusMessage *reply);
 
 DBusMessage *__dundee_error_invalid_args(DBusMessage *msg);
 DBusMessage *__dundee_error_failed(DBusMessage *msg);
+
+
+int __dundee_manager_init(void);
+void __dundee_manager_cleanup(void);

diff --git a/dundee/main.c b/dundee/main.c
index 95ee795..07b8501 100644 (file)
--- a/dundee/main.c
+++ b/dundee/main.c
@@ -232,15 +232,12 @@ int main(int argc, char **argv)
 
        __ofono_dbus_init(conn);
 
-       /*
-        * The reason why this DBG is here is that we have the __stop__debug,
-        * __start__debug linking symbols in the object. As soon we
-        * have real DBG we can remove this one again.
-        */
-       DBG("");
+       __dundee_manager_init();
 
        g_main_loop_run(event_loop);
 
+       __dundee_manager_cleanup();
+
        __ofono_dbus_cleanup();
        dbus_connection_unref(conn);
 

diff --git a/dundee/manager.c b/dundee/manager.c
new file mode 100644 (file)
index 0000000..61fa25e
--- /dev/null
+++ b/dundee/manager.c
@@ -0,0 +1,100 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2012  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012  BMW Car IT GmbH. 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
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <glib.h>
+#include <gdbus.h>
+
+#include "dundee.h"
+
+static DBusMessage *manager_get_devices(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       DBusMessageIter iter;
+       DBusMessageIter array;
+
+       DBG("");
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       dbus_message_iter_init_append(reply, &iter);
+
+       dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+                                       DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+                                       DBUS_TYPE_OBJECT_PATH_AS_STRING
+                                       DBUS_TYPE_ARRAY_AS_STRING
+                                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+                                       DBUS_TYPE_STRING_AS_STRING
+                                       DBUS_TYPE_VARIANT_AS_STRING
+                                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING
+                                       DBUS_STRUCT_END_CHAR_AS_STRING,
+                                       &array);
+
+       dbus_message_iter_close_container(&iter, &array);
+
+       return reply;
+}
+
+static const GDBusMethodTable manager_methods[] = {
+       { GDBUS_METHOD("GetDevices", NULL,
+               GDBUS_ARGS({ "devices", "a(oa{sv})" }), manager_get_devices) },
+       { }
+};
+
+static const GDBusSignalTable manager_signals[] = {
+       { GDBUS_SIGNAL("DevicesAdded",
+               GDBUS_ARGS({ "path", "o"},{ "properties", "a{sv}" })) },
+       { GDBUS_SIGNAL("DeviceRemoved",
+               GDBUS_ARGS({ "path", "o"})) },
+       { }
+};
+
+int __dundee_manager_init(void)
+{
+       DBusConnection *conn = ofono_dbus_get_connection();
+       gboolean ret;
+
+       ret = g_dbus_register_interface(conn, DUNDEE_MANAGER_PATH,
+                                       DUNDEE_MANAGER_INTERFACE,
+                                       manager_methods, manager_signals,
+                                       NULL, NULL, NULL);
+
+       if (ret == FALSE)
+               return -1;
+
+       return 0;
+}
+
+void __dundee_manager_cleanup(void)
+{
+       DBusConnection *conn = ofono_dbus_get_connection();
+
+       g_dbus_unregister_interface(conn, DUNDEE_MANAGER_PATH,
+                                       DUNDEE_MANAGER_INTERFACE);
+}