Add skeleton for adapter framework

5 files changed, 161 insertions, 23 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 317c431f..2f13ade2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -11,7 +11,7 @@ noinst_PROGRAMS = bluetoothd
 
 bluetoothd_SOURCES = main.c system.h \
 	manager.h manager.c database.h database.c \
-	service.h service.c
+	adapter.h adapter.c service.h service.c
 
 bluetoothd_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \
 			$(top_builddir)/sdpd/libsdpserver.a \
diff --git a/daemon/adapter.c b/daemon/adapter.c
new file mode 100644
index 00000000..12837507
--- /dev/null
+++ b/daemon/adapter.c
@@ -0,0 +1,115 @@
+/*
+ *
+ *  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 "dbus-helper.h"
+#include "logging.h"
+#include "notify.h"
+
+#include "system.h"
+#include "adapter.h"
+
+#define ADAPTER_INTERFACE "org.bluez.Adapter"
+
+static DBusConnection *connection = NULL;
+
+DBusMessage *adapter_list(DBusMessage *msg)
+{
+	DBusMessage *reply;
+	DBusMessageIter iter, array;
+	const char path[] = "/org/bluez/hci0", *ptr = path;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	dbus_message_iter_init_append(reply, &iter);
+
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+					DBUS_TYPE_STRING_AS_STRING, &array);
+
+	dbus_message_iter_append_basic(&array, DBUS_TYPE_STRING, &ptr);
+
+	dbus_message_iter_close_container(&iter, &array);
+
+	return reply;
+}
+
+DBusMessage *adapter_find(DBusMessage *msg)
+{
+	DBusMessage *reply;
+	const char *pattern;
+	const char path[] = "/org/bluez/hci0", *ptr = path;
+
+	dbus_message_get_args(msg, NULL,
+			DBUS_TYPE_STRING, &pattern, DBUS_TYPE_INVALID);
+
+	debug("Searching adapter with pattern \"%s\"", pattern);
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
+					DBUS_TYPE_INVALID);
+
+	return reply;
+}
+
+DBusMessage *adapter_default(DBusMessage *msg)
+{
+	DBusMessage *reply;
+	const char path[] = "/org/bluez/hci0", *ptr = path;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
+					DBUS_TYPE_INVALID);
+
+	return reply;
+}
+
+int adapter_init(DBusConnection *conn)
+{
+	connection = dbus_connection_ref(conn);
+
+	info("Starting adapter framework");
+
+	return 0;
+}
+
+void adapter_exit(void)
+{
+	info("Stopping adapter framework");
+
+	dbus_connection_unref(connection);
+
+	connection = NULL;
+}
diff --git a/daemon/adapter.h b/daemon/adapter.h
new file mode 100644
index 00000000..25c54d52
--- /dev/null
+++ b/daemon/adapter.h
@@ -0,0 +1,29 @@
+/*
+ *
+ *  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 adapter_init(DBusConnection *conn);
+void adapter_exit(void);
+
+DBusMessage *adapter_list(DBusMessage *msg);
+DBusMessage *adapter_find(DBusMessage *msg);
+DBusMessage *adapter_default(DBusMessage *msg);
diff --git a/daemon/main.c b/daemon/main.c
index 6c4bc963..56cc7782 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -47,6 +47,7 @@
 #include "system.h"
 #include "manager.h"
 #include "database.h"
+#include "adapter.h"
 #include "service.h"
 
 static GMainLoop *main_loop = NULL;
@@ -79,7 +80,16 @@ static int setup_dbus(void)
 		return -1;
 	}
 
+	if (adapter_init(system_bus) < 0) {
+		database_exit();
+		manager_exit();
+		dbus_connection_destroy_object_path(system_bus, SYSTEM_PATH);
+		dbus_connection_unref(system_bus);
+		return -1;
+	}
+
 	if (service_init(system_bus) < 0) {
+		adapter_exit();
 		database_exit();
 		manager_exit();
 		dbus_connection_destroy_object_path(system_bus, SYSTEM_PATH);
@@ -94,6 +104,8 @@ static void cleanup_dbus(void)
 {
 	service_exit();
 
+	adapter_exit();
+
 	database_exit();
 
 	manager_exit();
diff --git a/daemon/manager.c b/daemon/manager.c
index c919dc28..301e3aba 100644
--- a/daemon/manager.c
+++ b/daemon/manager.c
@@ -31,6 +31,7 @@
 #include "logging.h"
 
 #include "system.h"
+#include "adapter.h"
 #include "service.h"
 #include "manager.h"
 
@@ -41,23 +42,12 @@ static DBusConnection *connection = NULL;
 static DBusHandlerResult list_adapters(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
-	DBusMessageIter iter, array;
 	DBusMessage *reply;
-	const char path[] = "/org/bluez/hci0", *ptr = path;
 
-	reply = dbus_message_new_method_return(msg);
+	reply = adapter_list(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
-	dbus_message_iter_init_append(reply, &iter);
-
-	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-					DBUS_TYPE_STRING_AS_STRING, &array);
-
-	dbus_message_iter_append_basic(&array, DBUS_TYPE_STRING, &ptr);
-
-	dbus_message_iter_close_container(&iter, &array);
-
 	return dbus_connection_send_and_unref(conn, reply);
 }
 
@@ -65,15 +55,11 @@ static DBusHandlerResult find_adapter(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
 	DBusMessage *reply;
-	const char path[] = "/org/bluez/hci0", *ptr = path;
 
-	reply = dbus_message_new_method_return(msg);
+	reply = adapter_find(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
-	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
-					DBUS_TYPE_INVALID);
-
 	return dbus_connection_send_and_unref(conn, reply);
 }
 
@@ -81,15 +67,11 @@ static DBusHandlerResult default_adapter(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
 	DBusMessage *reply;
-	const char path[] = "/org/bluez/hci0", *ptr = path;
 
-	reply = dbus_message_new_method_return(msg);
+	reply = adapter_default(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
-	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
-					DBUS_TYPE_INVALID);
-
 	return dbus_connection_send_and_unref(conn, reply);
 }