Add skeleton for manager interface

4 files changed, 110 insertions, 3 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index be4b738f..0ab5e02d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -9,10 +9,9 @@ endif
 
 noinst_PROGRAMS = bluetoothd
 
-bluetoothd_SOURCES = main.c
+bluetoothd_SOURCES = main.c manager.h manager.c
 
 bluetoothd_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \
-			$(top_builddir)/hcid/libhciserver.a \
 			$(top_builddir)/sdpd/libsdpserver.a \
 			$(top_builddir)/common/libhelper.a
 
diff --git a/daemon/main.c b/daemon/main.c
index beec6482..43aafaa7 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -40,9 +40,10 @@
 #include "notify.h"
 #include "logging.h"
 
-#include "hcid.h"
 #include "sdpd.h"
 
+#include "manager.h"
+
 static GMainLoop *main_loop = NULL;
 
 static DBusConnection *system_bus = NULL;
@@ -163,7 +164,14 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
+	if (manager_init(system_bus) < 0) {
+		dbus_connection_unref(system_bus);
+		g_main_loop_unref(main_loop);
+		exit(1);
+	}
+
 	if (start_sdp_server(0, SDP_SERVER_COMPAT) < 0) {
+		manager_exit();
 		dbus_connection_unref(system_bus);
 		g_main_loop_unref(main_loop);
 		exit(1);
@@ -173,6 +181,8 @@ int main(int argc, char *argv[])
 
 	stop_sdp_server();
 
+	manager_exit();
+
 	dbus_connection_unref(system_bus);
 
 	notify_remove(CONFIGDIR);
diff --git a/daemon/manager.c b/daemon/manager.c
new file mode 100644
index 00000000..b68dd327
--- /dev/null
+++ b/daemon/manager.c
@@ -0,0 +1,73 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2004-2007  Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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 <dbus/dbus.h>
+
+#include "logging.h"
+
+#include "manager.h"
+
+#define MANAGER_PATH "/org/bluez"
+
+static DBusConnection *connection = NULL;
+
+static DBusHandlerResult manager_handler(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static DBusObjectPathVTable manager_table = {
+	.message_function = manager_handler,
+};
+
+int manager_init(DBusConnection *conn)
+{
+	connection = dbus_connection_ref(conn);
+
+	info("Starting manager interface");
+
+	if (dbus_connection_register_object_path(connection,
+			MANAGER_PATH, &manager_table, NULL) == FALSE) {
+		error("Manager path registration failed");
+		dbus_connection_unref(connection);
+		return -1;
+	}
+
+	return 0;
+}
+
+void manager_exit(void)
+{
+	info("Stopping manager interface");
+
+	dbus_connection_unregister_object_path(connection, MANAGER_PATH);
+
+	dbus_connection_unref(connection);
+
+	connection = NULL;
+}
diff --git a/daemon/manager.h b/daemon/manager.h
new file mode 100644
index 00000000..d92cedd8
--- /dev/null
+++ b/daemon/manager.h
@@ -0,0 +1,25 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2004-2007  Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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
+ *
+ */
+
+int manager_init(DBusConnection *conn);
+void manager_exit(void);