More cleanup. Move common dbus stuff to common/dbus.c. hcid/dbus.c -> hcid/dbus-hci.c

18 files changed, 882 insertions, 720 deletions

diff --git a/common/Makefile.am b/common/Makefile.am
index b2f6fb33..83ec45f4 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,9 +1,12 @@
 
+AM_CFLAGS = @DBUS_CFLAGS@
+
 noinst_LIBRARIES = libhelper.a
 
 libhelper_a_SOURCES = oui.h oui.c list.h list.c \
 	textfile.h textfile.c helper.h helper.c \
-	glib-ectomy.h glib-ectomy.c logging.h logging.c
+	glib-ectomy.h glib-ectomy.c logging.h logging.c \
+	dbus.h dbus.c
 
 noinst_PROGRAMS = test_textfile
 
diff --git a/common/dbus.c b/common/dbus.c
new file mode 100644
index 00000000..5ef1725e
--- /dev/null
+++ b/common/dbus.c
@@ -0,0 +1,563 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2004-2006  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 <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdint.h>
+
+#include <dbus/dbus.h>
+
+#include "glib-ectomy.h"
+#include "dbus.h"
+#include "logging.h"
+#include "list.h"
+
+#define DISPATCH_TIMEOUT	0
+
+static int name_listener_initialized = 0;
+
+static struct slist *name_listeners = NULL;
+
+typedef struct {
+	uint32_t id;
+	DBusTimeout *timeout;
+} timeout_handler_t;
+
+struct watch_info {
+	guint watch_id;
+	GIOChannel *io;
+	DBusConnection *conn;
+};
+
+struct disconnect_data {
+	void (*disconnect_cb)(void *);
+	void *user_data;
+};
+
+struct name_callback {
+	name_cb_t func;
+	void *user_data;
+};
+
+struct name_data {
+	char *name;
+	struct slist *callbacks;
+};
+
+static struct name_data *name_data_find(const char *name)
+{
+	struct slist *current;
+
+	for (current = name_listeners; current != NULL; current = current->next) {
+		struct name_data *data = current->data;
+		if (strcmp(name, data->name) == 0)
+			return data;
+	}
+
+	return NULL;
+}
+
+static struct name_callback *name_callback_find(struct slist *callbacks,
+						name_cb_t func, void *user_data)
+{
+	struct slist *current;
+
+	for (current = callbacks; current != NULL; current = current->next) {
+		struct name_callback *cb = current->data;
+		if (cb->func == func && cb->user_data == user_data)
+			return cb;
+	}
+
+	return NULL;
+}
+
+static void name_data_free(struct name_data *data)
+{
+	struct slist *l;
+
+	for (l = data->callbacks; l != NULL; l = l->next)
+		free(l->data);
+
+	slist_free(data->callbacks);
+
+	if (data->name)
+		free(data->name);
+
+	free(data);
+}
+
+static int name_data_add(const char *name, name_cb_t func, void *user_data)
+{
+	int first = 1;
+	struct name_data *data = NULL;
+	struct name_callback *cb = NULL;
+
+	cb = malloc(sizeof(struct name_callback));
+	if (!cb)
+		goto failed;
+
+	cb->func = func;
+	cb->user_data = user_data;
+
+	data = name_data_find(name);
+	if (data) {
+		first = 0;
+		goto done;
+	}
+
+	data = malloc(sizeof(struct name_data));
+	if (!data)
+		goto failed;
+
+	memset(data, 0, sizeof(struct name_data));
+
+	data->name = strdup(name);
+	if (!data->name)
+		goto failed;
+
+	name_listeners = slist_append(name_listeners, data);
+
+done:
+	data->callbacks = slist_append(data->callbacks, cb);
+	return first;
+
+failed:
+	if (data)
+		name_data_free(data);
+
+	if (cb)
+		free(cb);
+
+	return 0;
+}
+
+static void name_data_remove(const char *name, name_cb_t func, void *user_data)
+{
+	struct name_data *data;
+	struct name_callback *cb = NULL;
+
+	data = name_data_find(name);
+	if (!data)
+		return;
+
+	cb = name_callback_find(data->callbacks, func, user_data);
+	if (cb) {
+		data->callbacks = slist_remove(data->callbacks, cb);
+		free(cb);
+	}
+
+	if (!data->callbacks) {
+		name_listeners = slist_remove(name_listeners, data);
+		name_data_free(data);
+	}
+}
+
+static DBusHandlerResult name_exit_filter(DBusConnection *connection,
+					DBusMessage *message, void *user_data)
+{
+	struct slist *l;
+	struct name_data *data;
+	char *name, *old, *new;
+
+	if (!dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
+							"NameOwnerChanged"))
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	if (!dbus_message_get_args(message, NULL,
+				DBUS_TYPE_STRING, &name,
+				DBUS_TYPE_STRING, &old,
+				DBUS_TYPE_STRING, &new,
+				DBUS_TYPE_INVALID)) {
+		error("Invalid arguments for NameOwnerChanged signal");
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+
+	/* We are not interested of service creations */
+	if (*new != '\0')
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	data = name_data_find(name);
+	if (!data) {
+		error("Got NameOwnerChanged signal for %s which has no listeners", name);
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+
+	for (l = data->callbacks; l != NULL; l = l->next) {
+		struct name_callback *cb = l->data;
+		cb->func(name, cb->user_data);
+	}
+
+	name_listeners = slist_remove(name_listeners, data);
+	name_data_free(data);
+
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+int name_listener_add(DBusConnection *connection, const char *name,
+					name_cb_t func, void *user_data)
+{
+	DBusError err;
+	char match_string[128];
+	int first;
+
+	if (!name_listener_initialized) {
+		if (!dbus_connection_add_filter(connection, name_exit_filter, NULL, NULL)) {
+			error("dbus_connection_add_filter() failed");
+			return -1;
+		}
+		name_listener_initialized = 1;
+	}
+
+	first = name_data_add(name, func, user_data);
+	/* The filter is already added if this is not the first callback
+	 * registration for the name */
+	if (!first)
+		return 0;
+
+	debug("name_listener_add(%s)", name);
+
+	snprintf(match_string, sizeof(match_string),
+			"interface=%s,member=NameOwnerChanged,arg0=%s",
+			DBUS_INTERFACE_DBUS, name);
+
+	dbus_error_init(&err);
+	dbus_bus_add_match(connection, match_string, &err);
+
+	if (dbus_error_is_set(&err)) {
+		error("Adding match rule \"%s\" failed: %s", match_string,
+				err.message);
+		dbus_error_free(&err);
+		name_data_remove(name, func, user_data);
+		return -1;
+	}
+
+	return 0;
+}
+
+int name_listener_remove(DBusConnection *connection, const char *name,
+				name_cb_t func, void *user_data)
+{
+	struct name_data *data;
+	struct name_callback *cb;
+	DBusError err;
+	char match_string[128];
+
+	debug("name_listener_remove(%s)", name);
+
+	data = name_data_find(name);
+	if (!data) {
+		error("remove_name_listener: no listener for %s", name);
+		return -1;
+	}
+
+	cb = name_callback_find(data->callbacks, func, user_data);
+	if (!cb) {
+		error("No matching callback found for %s", name);
+		return -1;
+	}
+
+	data->callbacks = slist_remove(data->callbacks, cb);
+	free(cb);
+
+	/* Don't remove the filter if other callbacks exist */
+	if (data->callbacks)
+		return 0;
+
+	snprintf(match_string, sizeof(match_string),
+			"interface=%s,member=NameOwnerChanged,arg0=%s",
+			DBUS_INTERFACE_DBUS, name);
+
+	dbus_error_init(&err);
+	dbus_bus_remove_match(connection, match_string, &err);
+
+	if (dbus_error_is_set(&err)) {
+		error("Removing owner match rule for %s failed: %s",
+							name, err.message);
+		dbus_error_free(&err);
+		return -1;
+	}
+
+	name_data_remove(name, func, user_data);
+
+	return 0;
+}
+
+static DBusHandlerResult disconnect_filter(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	const char *iface,*method;
+	struct disconnect_data *dc_data = data;
+
+	if (dbus_message_get_type (msg) != DBUS_MESSAGE_TYPE_SIGNAL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	iface = dbus_message_get_interface(msg);
+	method = dbus_message_get_member(msg);
+
+	if ((strcmp(iface, DBUS_INTERFACE_LOCAL) == 0) &&
+			(strcmp(method, "Disconnected") == 0)) {
+		error("Got disconnected from the system message bus");
+		dbus_connection_unref(conn);
+		dc_data->disconnect_cb(dc_data->user_data);
+	}
+
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static gboolean message_dispatch_cb(void *data)
+{
+	DBusConnection *connection = data;
+
+	dbus_connection_ref(connection);
+
+	/* Dispatch messages */
+	while (dbus_connection_dispatch(connection) == DBUS_DISPATCH_DATA_REMAINS);
+
+	dbus_connection_unref(connection);
+
+	return FALSE;
+}
+
+static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
+{
+	DBusWatch *watch = data;
+	struct watch_info *info = dbus_watch_get_data(watch);
+	int flags = 0;
+
+	if (cond & G_IO_IN)  flags |= DBUS_WATCH_READABLE;
+	if (cond & G_IO_OUT) flags |= DBUS_WATCH_WRITABLE;
+	if (cond & G_IO_HUP) flags |= DBUS_WATCH_HANGUP;
+	if (cond & G_IO_ERR) flags |= DBUS_WATCH_ERROR;
+
+	dbus_watch_handle(watch, flags);
+
+	if (dbus_connection_get_dispatch_status(info->conn) == DBUS_DISPATCH_DATA_REMAINS)
+		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, info->conn);
+
+	return TRUE;
+}
+
+static dbus_bool_t add_watch(DBusWatch *watch, void *data)
+{
+	GIOCondition cond = G_IO_HUP | G_IO_ERR;
+	DBusConnection *conn = data;
+	struct watch_info *info;
+	int fd, flags;
+
+	if (!dbus_watch_get_enabled(watch))
+		return TRUE;
+
+	info = malloc(sizeof(struct watch_info));
+	if (info == NULL)
+		return FALSE;
+
+	fd = dbus_watch_get_fd(watch);
+	info->io = g_io_channel_unix_new(fd);
+	info->conn = dbus_connection_ref(conn);
+
+	dbus_watch_set_data(watch, info, NULL);
+
+	flags = dbus_watch_get_flags(watch);
+
+	if (flags & DBUS_WATCH_READABLE) cond |= G_IO_IN;
+	if (flags & DBUS_WATCH_WRITABLE) cond |= G_IO_OUT;
+
+	info->watch_id = g_io_add_watch(info->io, cond, watch_func, watch);
+
+	return TRUE;
+}
+
+static void remove_watch(DBusWatch *watch, void *data)
+{
+	struct watch_info *info = dbus_watch_get_data(watch);
+
+	dbus_watch_set_data(watch, NULL, NULL);
+
+	if (info) {
+		g_io_remove_watch(info->watch_id);
+		g_io_channel_unref(info->io);
+		dbus_connection_unref(info->conn);
+		free(info);
+	}
+}
+
+static void watch_toggled(DBusWatch *watch, void *data)
+{
+	/* Because we just exit on OOM, enable/disable is
+	 * no different from add/remove */
+	if (dbus_watch_get_enabled(watch))
+		add_watch(watch, data);
+	else
+		remove_watch(watch, data);
+}
+
+static gboolean timeout_handler_dispatch(gpointer data)
+{
+	timeout_handler_t *handler = data;
+
+	/* if not enabled should not be polled by the main loop */
+	if (dbus_timeout_get_enabled(handler->timeout) != TRUE)
+		return FALSE;
+
+	dbus_timeout_handle(handler->timeout);
+
+	return FALSE;
+}
+
+static void timeout_handler_free(void *data)
+{
+	timeout_handler_t *handler = data;
+	if (!handler)
+		return;
+
+	g_timeout_remove(handler->id);
+	free(handler);
+}
+
+static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
+{
+	timeout_handler_t *handler;
+
+	if (!dbus_timeout_get_enabled (timeout))
+		return TRUE;
+
+	handler = malloc(sizeof(timeout_handler_t));
+	memset(handler, 0, sizeof(timeout_handler_t));
+
+	handler->timeout = timeout;
+	handler->id = g_timeout_add(dbus_timeout_get_interval(timeout),
+					timeout_handler_dispatch, handler);
+
+	dbus_timeout_set_data(timeout, handler, timeout_handler_free);
+
+	return TRUE;
+}
+
+static void remove_timeout(DBusTimeout *timeout, void *data)
+{
+
+}
+
+static void timeout_toggled(DBusTimeout *timeout, void *data)
+{
+	if (dbus_timeout_get_enabled(timeout))
+		add_timeout(timeout, data);
+	else
+		remove_timeout(timeout, data);
+}
+
+static void dispatch_status_cb(DBusConnection *conn,
+				DBusDispatchStatus new_status,
+				void *data)
+{
+	if (!dbus_connection_get_is_connected(conn))
+		return;
+
+	if (new_status == DBUS_DISPATCH_DATA_REMAINS)
+		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, data);
+}
+
+DBusConnection *init_dbus(void (*disconnect_cb)(void *), void *user_data)
+{
+	DBusConnection *conn;
+	DBusError err;
+	struct disconnect_data *dc_data;
+
+	dbus_error_init(&err);
+
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+
+	if (dbus_error_is_set(&err)) {
+		error("Can't open system message bus connection: %s",
+				err.message);
+		dbus_error_free(&err);
+		return NULL;
+	}
+
+	dbus_connection_set_watch_functions(conn, add_watch, remove_watch,
+						watch_toggled, conn, NULL);
+
+	dbus_connection_set_timeout_functions(conn, add_timeout, remove_timeout,
+						timeout_toggled, conn, NULL);
+
+	dbus_connection_set_dispatch_status_function(conn, dispatch_status_cb,
+							conn, NULL);
+
+	if (!disconnect_cb)
+		return conn;
+
+	dc_data = malloc(sizeof(struct disconnect_data));
+	if (!dc_data) {
+		error("Allocating disconnect data failed");
+		dbus_connection_unref(conn);
+		return NULL;
+	}
+
+	dc_data->disconnect_cb = disconnect_cb;
+	dc_data->user_data = user_data;
+
+	dbus_connection_set_exit_on_disconnect(conn, FALSE);
+
+	if (!dbus_connection_add_filter(conn, disconnect_filter,
+				dc_data, free)) {
+		error("Can't add D-Bus disconnect filter");
+		free(dc_data);
+		dbus_connection_unref(conn);
+		return NULL;
+	}
+
+	return conn;
+}
+
+static char simple_xml[] = DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<node></node>";
+
+DBusHandlerResult simple_introspect(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
+	const char *path, *ptr = simple_xml;
+
+	path = dbus_message_get_path(msg);
+
+	info("Introspect path:%s", path);
+
+	if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING)) {
+		error("Unexpected signature to introspect call");
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
+					DBUS_TYPE_INVALID);
+
+	return send_message_and_unref(conn, reply);
+}
+
diff --git a/common/dbus.h b/common/dbus.h
new file mode 100644
index 00000000..59afd6e6
--- /dev/null
+++ b/common/dbus.h
@@ -0,0 +1,50 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2004-2006  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
+ *
+ */
+
+#ifndef __H_BLUEZ_DBUS_H__
+#define __H_BLUEZ_DBUS_H__
+
+#include <dbus/dbus.h>
+
+DBusConnection *init_dbus(void (*disconnect_cb)(void *), void *user_data);
+
+typedef void (*name_cb_t)(const char *name, void *user_data);
+
+int name_listener_add(DBusConnection *connection, const char *name,
+				name_cb_t func, void *user_data);
+int name_listener_remove(DBusConnection *connection, const char *name,
+				name_cb_t func, void *user_data);
+
+DBusHandlerResult simple_introspect(DBusConnection *conn, DBusMessage *msg, void *data);
+
+static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, DBusMessage *msg)
+{
+	if (msg) {
+		dbus_connection_send(conn, msg, NULL);
+		dbus_message_unref(msg);
+	}
+
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+#endif /* __H_BLUEZ_DBUS_H__ */
diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index 498e0589..560238c0 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -20,7 +20,7 @@ noinst_PROGRAMS = passkey-agent service-agent auth-agent
 hcid_SOURCES = main.c security.c device.c storage.c \
 		sdp.c sdp.h hcid.h parser.h parser.y \
 		lexer.l kword.c kword.h \
-		dbus.h dbus.c dbus-common.c dbus-common.h \
+		dbus-hci.h dbus-hci.c dbus-common.c dbus-common.h \
 		dbus-error.c dbus-error.h dbus-manager.c dbus-manager.h \
 		dbus-adapter.c dbus-adapter.h \
 		dbus-device.c dbus-device.h dbus-service.c dbus-service.h \
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 8fecc265..fef77456 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -48,6 +48,7 @@
 #include "oui.h"
 #include "list.h"
 #include "dbus-common.h"
+#include "dbus-hci.h"
 #include "dbus-sdp.h"
 #include "dbus-error.h"
 #include "dbus-adapter.h"
diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c
index 0c8d0339..c25156af 100644
--- a/hcid/dbus-common.c
+++ b/hcid/dbus-common.c
@@ -35,6 +35,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 
 #include <arpa/inet.h>
 
@@ -49,288 +50,24 @@
 #include "list.h"
 #include "dbus.h"
 #include "dbus-error.h"
+#include "dbus-hci.h"
+#include "dbus-manager.h"
 #include "dbus-adapter.h"
+#include "dbus-service.h"
 #include "dbus-security.h"
 #include "dbus-test.h"
 #include "dbus-rfcomm.h"
 #include "dbus-sdp.h"
 #include "dbus-common.h"
 
-static int name_listener_initialized = 0;
+#define BLUEZ_NAME "org.bluez"
 
-struct name_callback {
-	name_cb_t func;
-	void *user_data;
-};
-
-struct name_data {
-	char *name;
-	struct slist *callbacks;
-};
-
-static struct slist *name_listeners = NULL;
-
-static struct name_data *name_data_find(const char *name)
-{
-	struct slist *current;
-
-	for (current = name_listeners; current != NULL; current = current->next) {
-		struct name_data *data = current->data;
-		if (strcmp(name, data->name) == 0)
-			return data;
-	}
-
-	return NULL;
-}
-
-static struct name_callback *name_callback_find(struct slist *callbacks,
-						name_cb_t func, void *user_data)
-{
-	struct slist *current;
-
-	for (current = callbacks; current != NULL; current = current->next) {
-		struct name_callback *cb = current->data;
-		if (cb->func == func && cb->user_data == user_data)
-			return cb;
-	}
-
-	return NULL;
-}
-
-static void name_data_free(struct name_data *data)
-{
-	struct slist *l;
-
-	for (l = data->callbacks; l != NULL; l = l->next)
-		free(l->data);
-
-	slist_free(data->callbacks);
-
-	if (data->name)
-		free(data->name);
-
-	free(data);
-}
-
-static int name_data_add(const char *name, name_cb_t func, void *user_data)
-{
-	int first = 1;
-	struct name_data *data = NULL;
-	struct name_callback *cb = NULL;
-
-	cb = malloc(sizeof(struct name_callback));
-	if (!cb)
-		goto failed;
-
-	cb->func = func;
-	cb->user_data = user_data;
-
-	data = name_data_find(name);
-	if (data) {
-		first = 0;
-		goto done;
-	}
-
-	data = malloc(sizeof(struct name_data));
-	if (!data)
-		goto failed;
-
-	memset(data, 0, sizeof(struct name_data));
-
-	data->name = strdup(name);
-	if (!data->name)
-		goto failed;
-
-	name_listeners = slist_append(name_listeners, data);
-
-done:
-	data->callbacks = slist_append(data->callbacks, cb);
-	return first;
-
-failed:
-	if (data)
-		name_data_free(data);
-
-	if (cb)
-		free(cb);
-
-	return 0;
-}
-
-static void name_data_remove(const char *name, name_cb_t func, void *user_data)
-{
-	struct name_data *data;
-	struct name_callback *cb = NULL;
-
-	data = name_data_find(name);
-	if (!data)
-		return;
-
-	cb = name_callback_find(data->callbacks, func, user_data);
-	if (cb) {
-		data->callbacks = slist_remove(data->callbacks, cb);
-		free(cb);
-	}
-
-	if (!data->callbacks) {
-		name_listeners = slist_remove(name_listeners, data);
-		name_data_free(data);
-	}
-}
-
-static DBusHandlerResult name_exit_filter(DBusConnection *connection,
-					DBusMessage *message, void *user_data)
-{
-	struct slist *l;
-	struct name_data *data;
-	char *name, *old, *new;
-
-	if (!dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
-							"NameOwnerChanged"))
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(message, NULL,
-				DBUS_TYPE_STRING, &name,
-				DBUS_TYPE_STRING, &old,
-				DBUS_TYPE_STRING, &new,
-				DBUS_TYPE_INVALID)) {
-		error("Invalid arguments for NameOwnerChanged signal");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	/* We are not interested of service creations */
-	if (*new != '\0')
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	data = name_data_find(name);
-	if (!data) {
-		error("Got NameOwnerChanged signal for %s which has no listeners", name);
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	for (l = data->callbacks; l != NULL; l = l->next) {
-		struct name_callback *cb = l->data;
-		cb->func(name, cb->user_data);
-	}
-
-	name_listeners = slist_remove(name_listeners, data);
-	name_data_free(data);
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-int name_listener_add(DBusConnection *connection, const char *name,
-					name_cb_t func, void *user_data)
-{
-	DBusError err;
-	char match_string[128];
-	int first;
-
-	if (!name_listener_initialized) {
-		if (!dbus_connection_add_filter(connection, name_exit_filter, NULL, NULL)) {
-			error("dbus_connection_add_filter() failed");
-			return -1;
-		}
-		name_listener_initialized = 1;
-	}
-
-	first = name_data_add(name, func, user_data);
-	/* The filter is already added if this is not the first callback
-	 * registration for the name */
-	if (!first)
-		return 0;
-
-	debug("name_listener_add(%s)", name);
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-			DBUS_INTERFACE_DBUS, name);
-
-	dbus_error_init(&err);
-	dbus_bus_add_match(connection, match_string, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Adding match rule \"%s\" failed: %s", match_string,
-				err.message);
-		dbus_error_free(&err);
-		name_data_remove(name, func, user_data);
-		return -1;
-	}
-
-	return 0;
-}
-
-int name_listener_remove(DBusConnection *connection, const char *name,
-				name_cb_t func, void *user_data)
-{
-	struct name_data *data;
-	struct name_callback *cb;
-	DBusError err;
-	char match_string[128];
-
-	debug("name_listener_remove(%s)", name);
-
-	data = name_data_find(name);
-	if (!data) {
-		error("remove_name_listener: no listener for %s", name);
-		return -1;
-	}
-
-	cb = name_callback_find(data->callbacks, func, user_data);
-	if (!cb) {
-		error("No matching callback found for %s", name);
-		return -1;
-	}
-
-	data->callbacks = slist_remove(data->callbacks, cb);
-	free(cb);
+#define MAX_CONN_NUMBER		10
+#define RECONNECT_RETRY_TIMEOUT	5000
 
-	/* Don't remove the filter if other callbacks exist */
-	if (data->callbacks)
-		return 0;
+static DBusConnection *conn = NULL;
 
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-			DBUS_INTERFACE_DBUS, name);
-
-	dbus_error_init(&err);
-	dbus_bus_remove_match(connection, match_string, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Removing owner match rule for %s failed: %s",
-							name, err.message);
-		dbus_error_free(&err);
-		return -1;
-	}
-
-	name_data_remove(name, func, user_data);
-
-	return 0;
-}
-
-static char simple_xml[] = DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<node></node>";
-
-DBusHandlerResult simple_introspect(DBusConnection *conn, DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-	const char *path, *ptr = simple_xml;
-
-	path = dbus_message_get_path(msg);
-
-	info("Introspect path:%s", path);
-
-	if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
-		return error_invalid_arguments(conn, msg);
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply)
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-
-	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
-					DBUS_TYPE_INVALID);
-
-	return send_message_and_unref(conn, reply);
-}
+static int experimental = 0;
 
 service_handler_func_t find_service_handler(struct service_data *handlers, DBusMessage *msg)
 {
@@ -501,3 +238,152 @@ DBusHandlerResult handle_method_call(DBusConnection *conn, DBusMessage *msg, voi
 		return error_unknown_method(conn, msg);
 }
 
+void hcid_dbus_set_experimental(void)
+{
+	experimental = 1;
+}
+
+int hcid_dbus_use_experimental(void)
+{
+	return experimental;
+}
+
+static gboolean system_bus_reconnect(void *data)
+{
+	struct hci_dev_list_req *dl = NULL;
+	struct hci_dev_req *dr;
+	int sk, i;
+	gboolean ret_val = TRUE;
+
+	if (dbus_connection_get_is_connected(conn))
+		return FALSE;
+
+	if (hcid_dbus_init() < 0)
+		return TRUE;
+
+	/* Create and bind HCI socket */
+	sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
+	if (sk < 0) {
+		error("Can't open HCI socket: %s (%d)",
+				strerror(errno), errno);
+		return TRUE;
+	}
+
+	dl = malloc(HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl));
+	if (!dl) {
+		error("Can't allocate memory");
+		goto failed;
+	}
+
+	dl->dev_num = HCI_MAX_DEV;
+	dr = dl->dev_req;
+
+	if (ioctl(sk, HCIGETDEVLIST, (void *) dl) < 0) {
+		info("Can't get device list: %s (%d)",
+			strerror(errno), errno);
+		goto failed;
+	}
+
+	/* reset the default device */
+	set_default_adapter(-1);
+
+	for (i = 0; i < dl->dev_num; i++, dr++)
+		hcid_dbus_register_device(dr->dev_id);
+
+	ret_val = FALSE;
+
+failed:
+	if (sk >= 0)
+		close(sk);
+
+	if (dl)
+		free(dl);
+
+	return ret_val;
+}
+
+static void disconnect_callback(void *user_data)
+{
+	set_dbus_connection(NULL);
+	g_timeout_add(RECONNECT_RETRY_TIMEOUT, system_bus_reconnect,
+			NULL);
+}
+
+static const DBusObjectPathVTable manager_vtable = {
+	.message_function	= &handle_manager_method,
+	.unregister_function	= NULL
+};
+
+void hcid_dbus_exit(void)
+{
+	char **children;
+	DBusConnection *conn = get_dbus_connection();
+	int i;
+
+	if (!conn || !dbus_connection_get_is_connected(conn))
+		return;
+
+	release_default_agent();
+	release_default_auth_agent();
+	release_service_agents(conn);
+
+	/* Unregister all paths in Adapter path hierarchy */
+	if (!dbus_connection_list_registered(conn, BASE_PATH, &children))
+		goto done;
+
+	for (i = 0; children[i]; i++) {
+		char dev_path[MAX_PATH_LENGTH];
+
+		snprintf(dev_path, sizeof(dev_path), "%s/%s", BASE_PATH,
+				children[i]);
+
+		unregister_adapter_path(dev_path);
+	}
+
+	dbus_free_string_array(children);
+
+done:
+	unregister_adapter_path(BASE_PATH);
+
+	dbus_connection_unref(conn);
+	set_dbus_connection(NULL);
+}
+
+int hcid_dbus_init(void)
+{
+	DBusError err;
+	DBusConnection *conn;
+	int ret_val;
+
+	conn = init_dbus(disconnect_callback, NULL);
+	if (!conn)
+		return -1;
+
+	dbus_error_init(&err);
+
+	ret_val = dbus_bus_request_name(conn, BLUEZ_NAME, 0, &err);
+
+	if (ret_val != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ) {
+		error("Could not become the primary owner of %s.", BLUEZ_NAME);
+		return -1;
+	}
+
+	if (dbus_error_is_set(&err)) {
+		error("Can't get system bus name %s: %s", BLUEZ_NAME,
+				err.message);
+		dbus_error_free(&err);
+		return -1;
+	}
+
+	if (!dbus_connection_register_fallback(conn, BASE_PATH,
+						&manager_vtable, NULL)) {
+		error("D-Bus failed to register %s fallback", BASE_PATH);
+		return -1;
+	}
+
+	set_dbus_connection(conn);
+
+	dbus_connection_unref(conn);
+
+	return 0;
+}
diff --git a/hcid/dbus-common.h b/hcid/dbus-common.h
index 6bfbe33b..b9065982 100644
--- a/hcid/dbus-common.h
+++ b/hcid/dbus-common.h
@@ -26,6 +26,7 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
+#include <dbus/dbus.h>
 
 #define BASE_PATH		"/org/bluez"
 
@@ -40,15 +41,6 @@ struct service_data {
 	service_handler_func_t	handler_func;
 };
 
-typedef void (*name_cb_t)(const char *name, void *user_data);
-
-int name_listener_add(DBusConnection *connection, const char *name,
-				name_cb_t func, void *user_data);
-int name_listener_remove(DBusConnection *connection, const char *name,
-				name_cb_t func, void *user_data);
-
-DBusHandlerResult simple_introspect(DBusConnection *conn, DBusMessage *msg, void *data);
-
 service_handler_func_t find_service_handler(struct service_data *services, DBusMessage *msg);
 
 int str2uuid(uuid_t *uuid, const char *string);
@@ -57,16 +49,10 @@ int l2raw_connect(const char *local, const bdaddr_t *remote);
 
 int check_address(const char *addr);
 
-static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, DBusMessage *msg)
-{
-	if (msg) {
-		dbus_connection_send(conn, msg, NULL);
-		dbus_message_unref(msg);
-	}
+DBusHandlerResult handle_method_call(DBusConnection *conn, DBusMessage *msg, void *data);
 
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
+void hcid_dbus_exit(void);
 
-DBusHandlerResult handle_method_call(DBusConnection *conn, DBusMessage *msg, void *data);
+int hcid_dbus_init(void);
 
 #endif /* __BLUEZ_DBUS_COMMON_H */
diff --git a/hcid/dbus.c b/hcid/dbus-hci.c
index f2d55548..e39a0968 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus-hci.c
@@ -53,38 +53,9 @@
 #include "dbus-service.h"
 #include "dbus-manager.h"
 #include "dbus-adapter.h"
+#include "dbus-hci.h"
 
-#define BLUEZ_NAME "org.bluez"
-
-static DBusConnection *connection;
-
-static int default_dev = -1;
-
-static int experimental = 0;
-
-#define MAX_CONN_NUMBER			10
-#define RECONNECT_RETRY_TIMEOUT		5000
-#define DISPATCH_TIMEOUT		0
-
-typedef struct {
-	uint32_t id;
-	DBusTimeout *timeout;
-} timeout_handler_t;
-
-struct watch_info {
-	guint watch_id;
-	GIOChannel *io;
-};
-
-void hcid_dbus_set_experimental(void)
-{
-	experimental = 1;
-}
-
-int hcid_dbus_use_experimental(void)
-{
-	return experimental;
-}
+static DBusConnection *connection = NULL;
 
 void bonding_request_free(struct bonding_request_info *bonding)
 {
@@ -232,22 +203,22 @@ static int active_conn_append(struct slist **list, bdaddr_t *bdaddr,
 	return 0;
 }
 
-static int active_conn_remove(struct slist **list, uint16_t *handle)
+static int active_conn_remove(struct slist **list, uint16_t handle)
 {
 	struct active_conn_info *dev;
 	struct slist *l;
-	int ret_val = -1;
 
-	l = slist_find(*list, handle, active_conn_find_by_handle);
+	l = slist_find(*list, &handle, active_conn_find_by_handle);
+	if (!l)
+		return -1;
 
-	if (l) {
-		dev = l->data;
-		*list = slist_remove(*list, dev);
-		free(dev);
-		ret_val = 0;
-	}
+	dev = l->data;
+
+	*list = slist_remove(*list, dev);
 
-	return ret_val;
+	free(dev);
+
+	return 0;
 }
 
 DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status)
@@ -297,11 +268,6 @@ DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status)
 	}
 }
 
-int get_default_dev_id(void)
-{
-	return default_dev;
-}
-
 static inline int dev_append_signal_args(DBusMessage *signal, int first,
 						va_list var_args)
 {
@@ -361,17 +327,9 @@ static const DBusObjectPathVTable adapter_vtable = {
 	.unregister_function	= NULL
 };
 
-static const DBusObjectPathVTable manager_vtable = {
-	.message_function	= &handle_manager_method,
-	.unregister_function	= NULL
-};
-
 /*
  * HCI D-Bus services
  */
-static DBusHandlerResult hci_dbus_signal_filter(DBusConnection *conn,
-						DBusMessage *msg, void *data);
-
 static void reply_pending_requests(const char *path, struct adapter *adapter)
 {
 	DBusMessage *message;
@@ -426,7 +384,7 @@ static void reply_pending_requests(const char *path, struct adapter *adapter)
 	}
 }
 
-static int unregister_dbus_path(const char *path)
+int unregister_adapter_path(const char *path)
 {
 	struct adapter *adapter = NULL;
 
@@ -579,13 +537,14 @@ int hcid_dbus_unregister_device(uint16_t id)
 	send_message_and_unref(connection, message);
 
 failed:
-	ret = unregister_dbus_path(path);
+	ret = unregister_adapter_path(path);
 
-	if (ret == 0 && default_dev == id) {
-		default_dev = hci_get_route(NULL);
-		if (default_dev >= 0) {
+	if (ret == 0 && get_default_adapter() == id) {
+		int new_default = hci_get_route(NULL);
+		set_default_adapter(new_default);
+		if (new_default >= 0) {
 			snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH,
-					default_dev);
+					new_default);
 			message = dbus_message_new_signal(BASE_PATH,
 							MANAGER_INTERFACE,
 							"DefaultAdapterChanged");
@@ -701,8 +660,8 @@ int hcid_dbus_start_device(uint16_t id)
 	ret = 0;
 
 failed:
-	if (ret == 0 && default_dev < 0)
-		default_dev = id;
+	if (ret == 0 && get_default_adapter() < 0)
+		set_default_adapter(id);
 
 	if (dd >= 0)
 		hci_close_dev(dd);
@@ -1743,7 +1702,7 @@ void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status,
 					DBUS_TYPE_INVALID);
 
 	send_message_and_unref(connection, message);
-	active_conn_remove(&adapter->active_conn, &handle);
+	active_conn_remove(&adapter->active_conn, handle);
 
 failed:
 	if (peer_addr)
@@ -1752,252 +1711,6 @@ failed:
 	free(local_addr);
 }
 
-/*****************************************************************
- *
- *  Section reserved to D-Bus watch functions
- *
- *****************************************************************/
-static gboolean message_dispatch_cb(void *data)
-{
-	dbus_connection_ref(connection);
-
-	/* Dispatch messages */
-	while (dbus_connection_dispatch(connection) == DBUS_DISPATCH_DATA_REMAINS);
-
-	dbus_connection_unref(connection);
-
-	return FALSE;
-}
-
-static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
-	DBusWatch *watch = data;
-	int flags = 0;
-
-	if (cond & G_IO_IN)  flags |= DBUS_WATCH_READABLE;
-	if (cond & G_IO_OUT) flags |= DBUS_WATCH_WRITABLE;
-	if (cond & G_IO_HUP) flags |= DBUS_WATCH_HANGUP;
-	if (cond & G_IO_ERR) flags |= DBUS_WATCH_ERROR;
-
-	dbus_watch_handle(watch, flags);
-
-	if (dbus_connection_get_dispatch_status(connection) == DBUS_DISPATCH_DATA_REMAINS)
-		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, NULL);
-
-	return TRUE;
-}
-
-static dbus_bool_t add_watch(DBusWatch *watch, void *data)
-{
-	GIOCondition cond = G_IO_HUP | G_IO_ERR;
-	struct watch_info *info;
-	int fd, flags;
-
-	if (!dbus_watch_get_enabled(watch))
-		return TRUE;
-
-	info = malloc(sizeof(struct watch_info));
-	if (info == NULL)
-		return FALSE;
-
-	fd = dbus_watch_get_fd(watch);
-	info->io = g_io_channel_unix_new(fd);
-	flags = dbus_watch_get_flags(watch);
-
-	if (flags & DBUS_WATCH_READABLE) cond |= G_IO_IN;
-	if (flags & DBUS_WATCH_WRITABLE) cond |= G_IO_OUT;
-
-	info->watch_id = g_io_add_watch(info->io, cond, watch_func, watch);
-
-	dbus_watch_set_data(watch, info, NULL);
-
-	return TRUE;
-}
-
-static void remove_watch(DBusWatch *watch, void *data)
-{
-	struct watch_info *info = dbus_watch_get_data(watch);
-
-	dbus_watch_set_data(watch, NULL, NULL);
-
-	if (info) {
-		g_io_remove_watch(info->watch_id);
-		g_io_channel_unref(info->io);
-		free(info);
-	}
-}
-
-static void watch_toggled(DBusWatch *watch, void *data)
-{
-	/* Because we just exit on OOM, enable/disable is
-	 * no different from add/remove */
-	if (dbus_watch_get_enabled(watch))
-		add_watch(watch, data);
-	else
-		remove_watch(watch, data);
-}
-
-static gboolean timeout_handler_dispatch(gpointer data)
-{
-	timeout_handler_t *handler = data;
-
-	/* if not enabled should not be polled by the main loop */
-	if (dbus_timeout_get_enabled(handler->timeout) != TRUE)
-		return FALSE;
-
-	dbus_timeout_handle(handler->timeout);
-
-	return FALSE;
-}
-
-static void timeout_handler_free(void *data)
-{
-	timeout_handler_t *handler = data;
-	if (!handler)
-		return;
-
-	g_timeout_remove(handler->id);
-	free(handler);
-}
-
-static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
-{
-	timeout_handler_t *handler;
-
-	if (!dbus_timeout_get_enabled (timeout))
-		return TRUE;
-
-	handler = malloc(sizeof(timeout_handler_t));
-	memset(handler, 0, sizeof(timeout_handler_t));
-
-	handler->timeout = timeout;
-	handler->id = g_timeout_add(dbus_timeout_get_interval(timeout),
-					timeout_handler_dispatch, handler);
-
-	dbus_timeout_set_data(timeout, handler, timeout_handler_free);
-
-	return TRUE;
-}
-
-static void remove_timeout(DBusTimeout *timeout, void *data)
-{
-
-}
-
-static void timeout_toggled(DBusTimeout *timeout, void *data)
-{
-	if (dbus_timeout_get_enabled(timeout))
-		add_timeout(timeout, data);
-	else
-		remove_timeout(timeout, data);
-}
-
-static void dispatch_status_cb(DBusConnection *conn,
-				DBusDispatchStatus new_status,
-				void *data)
-{
-	if (!dbus_connection_get_is_connected(conn))
-			return;
-
-	if (new_status == DBUS_DISPATCH_DATA_REMAINS)
-		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, NULL);
-}
-
-int hcid_dbus_init(void)
-{
-	int ret_val;
-	DBusError err;
-
-	dbus_error_init(&err);
-
-	connection = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Can't open system message bus connection: %s",
-				err.message);
-		dbus_error_free(&err);
-		return -1;
-	}
-
-	dbus_connection_set_exit_on_disconnect(connection, FALSE);
-
-	ret_val = dbus_bus_request_name(connection, BLUEZ_NAME, 0, &err);
-
-	if (ret_val != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ) {
-		error("Service could not become the primary owner.");
-		return -1;
-	}
-
-	if (dbus_error_is_set(&err)) {
-		error("Can't get system message bus name: %s", err.message);
-		dbus_error_free(&err);
-		return -1;
-	}
-
-	if (!dbus_connection_register_fallback(connection, BASE_PATH,
-						&manager_vtable, NULL)) {
-		error("D-Bus failed to register %s fallback", BASE_PATH);
-		return -1;
-	}
-
-	if (!dbus_connection_add_filter(connection, hci_dbus_signal_filter,
-					NULL, NULL)) {
-		error("Can't add new HCI filter");
-		return -1;
-	}
-
-	dbus_connection_set_watch_functions(connection,
-			add_watch, remove_watch, watch_toggled, NULL, NULL);
-
-	dbus_connection_set_timeout_functions(connection,
-			add_timeout, remove_timeout, timeout_toggled, NULL,
-			NULL);
-
-	dbus_connection_set_dispatch_status_function(connection,
-			dispatch_status_cb, NULL, NULL);
-
-	return 0;
-}
-
-void hcid_dbus_exit(void)
-{
-	char **children;
-	int i;
-
-	if (!dbus_connection_get_is_connected(connection))
-		return;
-
-	release_default_agent();
-	release_default_auth_agent();
-	release_service_agents(connection);
-
-	/* Unregister all paths in Adapter path hierarchy */
-	if (!dbus_connection_list_registered(connection, BASE_PATH, &children))
-		goto done;
-
-	for (i = 0; children[i]; i++) {
-		char dev_path[MAX_PATH_LENGTH];
-
-		snprintf(dev_path, sizeof(dev_path), "%s/%s", BASE_PATH,
-				children[i]);
-
-		unregister_dbus_path(dev_path);
-	}
-
-	dbus_free_string_array(children);
-
-done:
-	unregister_dbus_path(BASE_PATH);
-
-	dbus_connection_unref(connection);
-}
-
-/*****************************************************************
- *
- *  Section reserved to re-connection timer
- *
- *****************************************************************/
-
 gboolean discov_timeout_handler(void *data)
 {
 	struct adapter *adapter = data;
@@ -2044,92 +1757,6 @@ failed:
 	return retval;
 }
 
-static gboolean system_bus_reconnect(void *data)
-{
-	struct hci_dev_list_req *dl = NULL;
-	struct hci_dev_req *dr;
-	int sk, i;
-	gboolean ret_val = TRUE;
-
-	if (dbus_connection_get_is_connected(connection))
-		return FALSE;
-
-	if (hcid_dbus_init() == FALSE)
-		return TRUE;
-
-	/* Create and bind HCI socket */
-	sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
-	if (sk < 0) {
-		error("Can't open HCI socket: %s (%d)",
-				strerror(errno), errno);
-		return TRUE;
-	}
-
-	dl = malloc(HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl));
-	if (!dl) {
-		error("Can't allocate memory");
-		goto failed;
-	}
-
-	dl->dev_num = HCI_MAX_DEV;
-	dr = dl->dev_req;
-
-	if (ioctl(sk, HCIGETDEVLIST, (void *) dl) < 0) {
-		info("Can't get device list: %s (%d)",
-			strerror(errno), errno);
-		goto failed;
-	}
-
-	/* reset the default device */
-	default_dev = -1;
-
-	for (i = 0; i < dl->dev_num; i++, dr++)
-		hcid_dbus_register_device(dr->dev_id);
-
-	ret_val = FALSE;
-
-failed:
-	if (sk >= 0)
-		close(sk);
-
-	if (dl)
-		free(dl);
-
-	return ret_val;
-}
-
-/*****************************************************************
- *
- *  Section reserved to D-Bus signal/messages handling function
- *
- *****************************************************************/
-static DBusHandlerResult hci_dbus_signal_filter(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	const char *iface;
-	const char *method;
-
-	if (!msg || !conn)
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (dbus_message_get_type (msg) != DBUS_MESSAGE_TYPE_SIGNAL)
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	iface = dbus_message_get_interface(msg);
-	method = dbus_message_get_member(msg);
-
-	if ((strcmp(iface, DBUS_INTERFACE_LOCAL) == 0) &&
-			(strcmp(method, "Disconnected") == 0)) {
-		error("Got disconnected from the system message bus");
-		dbus_connection_unref(conn);
-		g_timeout_add(RECONNECT_RETRY_TIMEOUT, system_bus_reconnect,
-				NULL);
-	}
-
-	return ret;
-}
-
 /*****************************************************************
  *  
  *  Section reserved to device HCI callbacks
@@ -2578,6 +2205,7 @@ int cancel_periodic_discovery(struct adapter *adapter)
 	}
 
 	hci_close_dev(dd);
+
 cleanup:
 	/*
 	 * Reset pdiscov_requestor and pdiscov_active is done when the
@@ -2589,3 +2217,17 @@ cleanup:
 
 	return err;
 }
+
+/* Most of the functions in this module require easy access to a connection so
+ * we keep it global here and provide these access functions the other (few)
+ * modules that require access to it */
+
+void set_dbus_connection(DBusConnection *conn)
+{
+	connection = conn;
+}
+
+DBusConnection *get_dbus_connection(void)
+{
+	return connection;
+}
diff --git a/hcid/dbus.h b/hcid/dbus-hci.h
index 695633db..56572b35 100644
--- a/hcid/dbus.h
+++ b/hcid/dbus-hci.h
@@ -21,13 +21,39 @@
  *
  */
 
-#ifndef __H_BLUEZ_DBUS_H__
-#define __H_BLUEZ_DBUS_H__
+#ifndef __H_BLUEZ_DBUS_HCI_H__
+#define __H_BLUEZ_DBUS_HCI_H__
 
 #include <dbus/dbus.h>
 #include "dbus-adapter.h"
 
-DBusMessage *dev_signal_factory(const int devid, const char *prop_name, const int first, ...);
+void hcid_dbus_set_experimental();
+int hcid_dbus_use_experimental();
+int hcid_dbus_register_device(uint16_t id);
+int hcid_dbus_unregister_device(uint16_t id);
+int hcid_dbus_start_device(uint16_t id);
+int hcid_dbus_stop_device(uint16_t id);
+void hcid_dbus_pending_pin_req_add(bdaddr_t *sba, bdaddr_t *dba);
+int hcid_dbus_request_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci);
+int hcid_dbus_confirm_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci, char *pin);
+
+void hcid_dbus_inquiry_start(bdaddr_t *local);
+void hcid_dbus_inquiry_complete(bdaddr_t *local);
+void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status);
+void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status);
+void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi, uint8_t *data);
+void hcid_dbus_remote_class(bdaddr_t *local, bdaddr_t *peer, uint32_t class);
+void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, char *name);
+void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, bdaddr_t *peer);
+void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, uint8_t reason);
+void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t status);
+void hcid_dbus_setname_complete(bdaddr_t *local);
+void hcid_dbus_setscan_enable_complete(bdaddr_t *local);
+void hcid_dbus_pin_code_reply(bdaddr_t *local, void *ptr);
+
+int unregister_adapter_path(const char *path);
+
+DBusMessage *dev_signal_factory(int devid, const char *prop_name, int first, ...);
 
 DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status);
 
@@ -50,4 +76,8 @@ int found_device_req_name(struct adapter *dbus_data);
 
 int discov_timeout_handler(void *data);
 
-#endif /* __H_BLUEZ_DBUS_H__ */
+void set_dbus_connection(DBusConnection *conn);
+
+DBusConnection *get_dbus_connection(void);
+
+#endif /* __H_BLUEZ_DBUS_HCI_H__ */
diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c
index 0def0476..4833e05f 100644
--- a/hcid/dbus-manager.c
+++ b/hcid/dbus-manager.c
@@ -46,6 +46,8 @@
 #include "dbus-service.h"
 #include "dbus-manager.h"
 
+static int default_adapter_id = -1;
+
 static DBusHandlerResult interface_version(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
@@ -70,19 +72,18 @@ static DBusHandlerResult default_adapter(DBusConnection *conn,
 {
 	DBusMessage *reply;
 	char path[MAX_PATH_LENGTH], *path_ptr = path;
-	int default_dev = get_default_dev_id();
 
 	if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
 		return error_invalid_arguments(conn, msg);
 
-	if (default_dev < 0)
+	if (default_adapter_id < 0)
 		return error_no_such_adapter(conn, msg);
 
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
-	snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, default_dev);
+	snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, default_adapter_id);
 
 	dbus_message_append_args(reply, DBUS_TYPE_STRING, &path_ptr,
 					DBUS_TYPE_INVALID);
@@ -350,3 +351,13 @@ DBusHandlerResult handle_manager_method(DBusConnection *conn,
 
 	return error_unknown_method(conn, msg);
 }
+
+int get_default_adapter(void)
+{
+	return default_adapter_id;
+}
+
+void set_default_adapter(int new_default)
+{
+	default_adapter_id = new_default;
+}
diff --git a/hcid/dbus-manager.h b/hcid/dbus-manager.h
index 17b34052..f95af777 100644
--- a/hcid/dbus-manager.h
+++ b/hcid/dbus-manager.h
@@ -28,4 +28,8 @@
 
 DBusHandlerResult handle_manager_method(DBusConnection *conn, DBusMessage *msg, void *data);
 
+int get_default_adapter(void);
+
+void set_default_adapter(int new_default);
+
 #endif /* __MANAGER_H */
diff --git a/hcid/dbus-rfcomm.c b/hcid/dbus-rfcomm.c
index 0217ef96..479763fa 100644
--- a/hcid/dbus-rfcomm.c
+++ b/hcid/dbus-rfcomm.c
@@ -48,6 +48,8 @@
 #include "glib-ectomy.h"
 #include "dbus.h"
 #include "dbus-common.h"
+#include "dbus-hci.h"
+#include "dbus-adapter.h"
 #include "dbus-error.h"
 #include "dbus-sdp.h"
 #include "dbus-rfcomm.h"
diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c
index 1d3d9f1d..f4f462f6 100644
--- a/hcid/dbus-sdp.c
+++ b/hcid/dbus-sdp.c
@@ -46,10 +46,13 @@
 
 #include <dbus/dbus.h>
 
+#include "list.h"
 #include "dbus.h"
 #include "hcid.h"
 #include "textfile.h"
+#include "dbus-hci.h"
 #include "dbus-common.h"
+#include "dbus-adapter.h"
 #include "dbus-error.h"
 #include "dbus-sdp.h"
 
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index ae93aadf..4d39e2f6 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -39,6 +39,7 @@
 #include "dbus.h"
 #include "hcid.h"
 #include "dbus-common.h"
+#include "dbus-adapter.h"
 #include "dbus-service.h"
 #include "dbus-error.h"
 #include "dbus-security.h"
diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c
index 2153aed7..4dea5780 100644
--- a/hcid/dbus-test.c
+++ b/hcid/dbus-test.c
@@ -33,9 +33,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
 
+#include "list.h"
 #include "hcid.h"
 #include "dbus.h"
 #include "dbus-common.h"
+#include "dbus-hci.h"
+#include "dbus-adapter.h"
 #include "dbus-error.h"
 #include "dbus-test.h"
 
diff --git a/hcid/hcid.h b/hcid/hcid.h
index 3950abcd..e1465cce 100644
--- a/hcid/hcid.h
+++ b/hcid/hcid.h
@@ -140,32 +140,6 @@ void toggle_pairing(int enable);
 
 void set_pin_length(bdaddr_t *sba, int length);
 
-int hcid_dbus_init(void);
-void hcid_dbus_exit(void);
-void hcid_dbus_set_experimental();
-int hcid_dbus_use_experimental();
-int hcid_dbus_register_device(uint16_t id);
-int hcid_dbus_unregister_device(uint16_t id);
-int hcid_dbus_start_device(uint16_t id);
-int hcid_dbus_stop_device(uint16_t id);
-void hcid_dbus_pending_pin_req_add(bdaddr_t *sba, bdaddr_t *dba);
-int hcid_dbus_request_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci);
-int hcid_dbus_confirm_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci, char *pin);
-
-void hcid_dbus_inquiry_start(bdaddr_t *local);
-void hcid_dbus_inquiry_complete(bdaddr_t *local);
-void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status);
-void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status);
-void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi, uint8_t *data);
-void hcid_dbus_remote_class(bdaddr_t *local, bdaddr_t *peer, uint32_t class);
-void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, char *name);
-void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, bdaddr_t *peer);
-void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, uint8_t reason);
-void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t status);
-void hcid_dbus_setname_complete(bdaddr_t *local);
-void hcid_dbus_setscan_enable_complete(bdaddr_t *local);
-void hcid_dbus_pin_code_reply(bdaddr_t *local, void *ptr);
-
 void init_devices(void);
 int add_device(uint16_t dev_id);
 int remove_device(uint16_t dev_id);
diff --git a/hcid/main.c b/hcid/main.c
index 38a4efe0..2ca34681 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -46,6 +46,8 @@
 
 #include "hcid.h"
 #include "sdp.h"
+#include "dbus-common.h"
+#include "dbus-hci.h"
 
 struct hcid_opts hcid;
 struct device_opts default_device;
diff --git a/hcid/security.c b/hcid/security.c
index 7d2ff9c1..2bf4ce1d 100644
--- a/hcid/security.c
+++ b/hcid/security.c
@@ -51,6 +51,7 @@
 #include "hcid.h"
 #include "textfile.h"
 #include "list.h"
+#include "dbus-hci.h"
 
 struct g_io_info {
 	GIOChannel	*channel;