From: Daniel Wagner <[email protected]>
---
Makefile.am | 2 +-
elect/elect.h | 8 ++++-
elect/main.c | 9 ++---
elect/manager.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 109 insertions(+), 8 deletions(-)
create mode 100644 elect/manager.c
diff --git a/Makefile.am b/Makefile.am
index 42cefbc..65036e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -653,7 +653,7 @@ sbin_PROGRAMS += elect/electd
elect_electd_SOURCES = $(gdbus_sources) \
src/log.c src/dbus.c \
- elect/main.c
+ elect/main.c elect/manager.c
elect_electd_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@
-ldl
diff --git a/elect/elect.h b/elect/elect.h
index 62b9330..b395ca5 100644
--- a/elect/elect.h
+++ b/elect/elect.h
@@ -38,7 +38,9 @@ void __ofono_log_enable(struct ofono_debug_desc *start,
#include <ofono/dbus.h>
-#define ELECT_SERVICE "org.ofono.elect"
+#define ELECT_SERVICE "org.ofono.elect"
+#define ELECT_MANAGER_INTERFACE "org.ofono.elect.Manager"
+#define ELECT_MANAGER_PATH "/"
int __ofono_dbus_init(DBusConnection *conn);
void __ofono_dbus_cleanup(void);
@@ -63,3 +65,7 @@ DBusMessage *__ofono_error_not_registered(DBusMessage *msg);
DBusMessage *__ofono_error_canceled(DBusMessage *msg);
DBusMessage *__ofono_error_access_denied(DBusMessage *msg);
DBusMessage *__ofono_error_emergency_active(DBusMessage *msg);
+
+
+int __elect_manager_init(DBusConnection *conn);
+void __elect_manager_cleanup(void);
diff --git a/elect/main.c b/elect/main.c
index 714f8c8..36cd6a0 100644
--- a/elect/main.c
+++ b/elect/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("");
+ __elect_manager_init(conn);
g_main_loop_run(event_loop);
+ __elect_manager_cleanup();
+
__ofono_dbus_cleanup();
dbus_connection_unref(conn);
diff --git a/elect/manager.c b/elect/manager.c
new file mode 100644
index 0000000..34a46a9
--- /dev/null
+++ b/elect/manager.c
@@ -0,0 +1,98 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011 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 "elect.h"
+
+static DBusConnection *connection;
+
+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 GDBusMethodTable manager_methods[] = {
+ { "GetDevices", "", "a(oa{sv})", manager_get_devices },
+ { }
+};
+
+static GDBusSignalTable manager_signals[] = {
+ { "DeviceAdded", "oa{sv}" },
+ { "DeviceRemoved", "o" },
+ { }
+};
+
+int __elect_manager_init(DBusConnection *conn)
+{
+ gboolean ret;
+
+ connection = conn;
+
+ ret = g_dbus_register_interface(connection, ELECT_MANAGER_PATH,
+ ELECT_MANAGER_INTERFACE,
+ manager_methods, manager_signals,
+ NULL, NULL, NULL);
+
+ if (ret == FALSE)
+ return -1;
+
+ return 0;
+}
+
+void __elect_manager_cleanup(void)
+{
+ g_dbus_unregister_interface(connection, ELECT_MANAGER_PATH,
+ ELECT_MANAGER_INTERFACE);
+}
--
1.7.8.110.g4cb5d1
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
