Move service record registration into adapter

3 files changed, 157 insertions, 250 deletions

diff --git a/src/adapter.c b/src/adapter.c
index a16d1a4b..18b03313 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -50,12 +50,12 @@
 
 #include "hcid.h"
 #include "sdpd.h"
+#include "sdp-xml.h"
 #include "manager.h"
 #include "adapter.h"
 #include "device.h"
 #include "dbus-common.h"
 #include "dbus-hci.h"
-#include "dbus-database.h"
 #include "error.h"
 #include "glib-helper.h"
 #include "agent.h"
@@ -75,8 +75,8 @@ static DBusConnection *connection = NULL;
 static GSList *adapter_drivers = NULL;
 
 struct record_list {
-  sdp_list_t *recs;
-  const gchar *addr;
+	sdp_list_t *recs;
+	const gchar *addr;
 };
 
 struct session_req {
@@ -93,6 +93,27 @@ struct service_auth {
 	void *user_data;
 };
 
+static GSList *records = NULL;
+
+struct record_data {
+	uint32_t handle;
+	char *sender;
+	guint listener_id;
+};
+
+static struct record_data *find_record(uint32_t handle, const char *sender)
+{
+	GSList *list;
+
+	for (list = records; list; list = list->next) {
+		struct record_data *data = list->data;
+		if (handle == data->handle && !strcmp(sender, data->sender))
+			return data;
+	}
+
+	return NULL;
+}
+
 static inline DBusMessage *invalid_args(DBusMessage *msg)
 {
 	return g_dbus_create_error(msg, ERROR_INTERFACE ".InvalidArguments",
@@ -120,7 +141,7 @@ static inline DBusMessage *no_such_adapter(DBusMessage *msg)
 static inline DBusMessage *failed_strerror(DBusMessage *msg, int err)
 {
 	return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
-			strerror(err));
+							strerror(err));
 }
 
 static inline DBusMessage *in_progress(DBusMessage *msg, const char *str)
@@ -1887,6 +1908,56 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
 	return dbus_message_new_method_return(msg);
 }
 
+static void exit_callback(void *user_data)
+{
+	struct record_data *user_record = user_data;
+
+	debug("remove record");
+
+	records = g_slist_remove(records, user_record);
+
+	remove_record_from_server(user_record->handle);
+
+	g_free(user_record->sender);
+	g_free(user_record);
+}
+
+static int add_xml_record(DBusConnection *conn, const char *sender,
+		bdaddr_t *src, const char *record, dbus_uint32_t *handle)
+{
+	struct record_data *user_record;
+	sdp_record_t *sdp_record;
+
+	sdp_record = sdp_xml_parse_record(record, strlen(record));
+	if (!sdp_record) {
+		error("Parsing of XML service record failed");
+		return -EIO;
+	}
+
+	if (add_record_to_server(src, sdp_record) < 0) {
+		error("Failed to register service record");
+		sdp_record_free(sdp_record);
+		return -EIO;
+	}
+
+	user_record = g_new0(struct record_data, 1);
+
+	user_record->handle = sdp_record->handle;
+
+	user_record->sender = g_strdup(sender);
+
+	records = g_slist_append(records, user_record);
+
+	user_record->listener_id = g_dbus_add_disconnect_watch(conn, sender,
+					exit_callback, user_record, NULL);
+
+	debug("listener_id %d", user_record->listener_id);
+
+	*handle = user_record->handle;
+
+	return 0;
+}
+
 static DBusMessage *add_service_record(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
@@ -1917,6 +1988,68 @@ static DBusMessage *add_service_record(DBusConnection *conn,
 	return reply;
 }
 
+static DBusMessage *update_record(DBusConnection *conn, DBusMessage *msg,
+		bdaddr_t *src, dbus_uint32_t handle, sdp_record_t *sdp_record)
+{
+	int err;
+
+	if (remove_record_from_server(handle) < 0) {
+		sdp_record_free(sdp_record);
+		return g_dbus_create_error(msg,
+				ERROR_INTERFACE ".NotAvailable",
+				"Not Available");
+	}
+
+	sdp_record->handle = handle;
+	err = add_record_to_server(src, sdp_record);
+	if (err < 0) {
+		sdp_record_free(sdp_record);
+		error("Failed to update the service record");
+		return g_dbus_create_error(msg,
+				ERROR_INTERFACE ".Failed",
+				strerror(EIO));
+	}
+
+	return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *update_xml_record(DBusConnection *conn,
+					DBusMessage *msg, bdaddr_t *src)
+{
+	struct record_data *user_record;
+	sdp_record_t *sdp_record;
+	const char *record;
+	dbus_uint32_t handle;
+	int len;
+
+	if (dbus_message_get_args(msg, NULL,
+				DBUS_TYPE_UINT32, &handle,
+				DBUS_TYPE_STRING, &record,
+				DBUS_TYPE_INVALID) == FALSE)
+		return NULL;
+
+	len = (record ? strlen(record) : 0);
+	if (len == 0)
+		return invalid_args(msg);
+
+	user_record = find_record(handle, dbus_message_get_sender(msg));
+	if (!user_record)
+		return g_dbus_create_error(msg,
+				ERROR_INTERFACE ".NotAvailable",
+				"Not Available");
+
+	sdp_record = sdp_xml_parse_record(record, len);
+	if (!sdp_record) {
+		error("Parsing of XML service record failed");
+		sdp_record_free(sdp_record);
+		return g_dbus_create_error(msg,
+				ERROR_INTERFACE ".Failed",
+				strerror(EIO));
+	}
+
+	return update_record(conn, msg, src, handle, sdp_record);
+}
+
 static DBusMessage *update_service_record(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
@@ -1928,6 +2061,26 @@ static DBusMessage *update_service_record(DBusConnection *conn,
 	return update_xml_record(conn, msg, &src);
 }
 
+static int remove_record(DBusConnection *conn, const char *sender,
+							dbus_uint32_t handle)
+{
+	struct record_data *user_record;
+
+	debug("remove record 0x%x", handle);
+
+	user_record = find_record(handle, sender);
+	if (!user_record)
+		return -1;
+
+	debug("listner_id %d", user_record->listener_id);
+
+	g_dbus_remove_watch(conn, user_record->listener_id);
+
+	exit_callback(user_record);
+
+	return 0;
+}
+
 static DBusMessage *remove_service_record(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
diff --git a/src/dbus-database.c b/src/dbus-database.c
deleted file mode 100644
index 4d2bb911..00000000
--- a/src/dbus-database.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2007  Nokia Corporation
- *  Copyright (C) 2004-2008  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 <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
-#include <gdbus.h>
-
-#include "sdpd.h"
-#include "sdp-xml.h"
-#include "error.h"
-#include "logging.h"
-
-static GSList *records = NULL;
-
-struct record_data {
-	uint32_t handle;
-	char *sender;
-	guint listener_id;
-};
-
-static struct record_data *find_record(uint32_t handle, const char *sender)
-{
-	GSList *list;
-
-	for (list = records; list; list = list->next) {
-		struct record_data *data = list->data;
-		if (handle == data->handle && !strcmp(sender, data->sender))
-			return data;
-	}
-
-	return NULL;
-}
-
-static void exit_callback(void *user_data)
-{
-	struct record_data *user_record = user_data;
-
-	debug("remove record");
-
-	records = g_slist_remove(records, user_record);
-
-	remove_record_from_server(user_record->handle);
-
-	g_free(user_record->sender);
-	g_free(user_record);
-}
-
-static inline DBusMessage *invalid_arguments(DBusMessage *msg)
-{
-	return g_dbus_create_error(msg, ERROR_INTERFACE ".InvalidArguments",
-					"Invalid arguments in method call");
-}
-
-static inline DBusMessage *not_available(DBusMessage *msg)
-{
-	return g_dbus_create_error(msg, ERROR_INTERFACE ".NotAvailable",
-							"Not Available");
-}
-
-static inline DBusMessage *failed(DBusMessage *msg)
-{
-	return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed", "Failed");
-}
-
-int add_xml_record(DBusConnection *conn, const char *sender, bdaddr_t *src,
-				const char *record, dbus_uint32_t *handle)
-{
-	struct record_data *user_record;
-	sdp_record_t *sdp_record;
-
-	sdp_record = sdp_xml_parse_record(record, strlen(record));
-	if (!sdp_record) {
-		error("Parsing of XML service record failed");
-		return -EIO;
-	}
-
-	if (add_record_to_server(src, sdp_record) < 0) {
-		error("Failed to register service record");
-		sdp_record_free(sdp_record);
-		return -EIO;
-	}
-
-	user_record = g_new0(struct record_data, 1);
-
-	user_record->handle = sdp_record->handle;
-
-	user_record->sender = g_strdup(sender);
-
-	records = g_slist_append(records, user_record);
-
-	user_record->listener_id = g_dbus_add_disconnect_watch(conn, sender,
-					exit_callback, user_record, NULL);
-
-	debug("listener_id %d", user_record->listener_id);
-
-	*handle = user_record->handle;
-
-	return 0;
-}
-
-static DBusMessage *update_record(DBusConnection *conn, DBusMessage *msg,
-		bdaddr_t *src, dbus_uint32_t handle, sdp_record_t *sdp_record)
-{
-	int err;
-
-	if (remove_record_from_server(handle) < 0) {
-		sdp_record_free(sdp_record);
-		return g_dbus_create_error(msg,
-				ERROR_INTERFACE ".NotAvailable",
-				"Not Available");
-	}
-
-	sdp_record->handle = handle;
-	err = add_record_to_server(src, sdp_record);
-	if (err < 0) {
-		sdp_record_free(sdp_record);
-		error("Failed to update the service record");
-		return g_dbus_create_error(msg,
-				ERROR_INTERFACE ".Failed",
-				strerror(EIO));
-	}
-
-	return dbus_message_new_method_return(msg);
-}
-
-DBusMessage *update_xml_record(DBusConnection *conn,
-				DBusMessage *msg, bdaddr_t *src)
-{
-	struct record_data *user_record;
-	sdp_record_t *sdp_record;
-	const char *record;
-	dbus_uint32_t handle;
-	int len;
-
-	if (dbus_message_get_args(msg, NULL,
-				DBUS_TYPE_UINT32, &handle,
-				DBUS_TYPE_STRING, &record,
-				DBUS_TYPE_INVALID) == FALSE)
-		return NULL;
-
-	len = (record ? strlen(record) : 0);
-	if (len == 0)
-		return invalid_arguments(msg);
-
-	user_record = find_record(handle, dbus_message_get_sender(msg));
-	if (!user_record)
-		return g_dbus_create_error(msg,
-				ERROR_INTERFACE ".NotAvailable",
-				"Not Available");
-
-	sdp_record = sdp_xml_parse_record(record, len);
-	if (!sdp_record) {
-		error("Parsing of XML service record failed");
-		sdp_record_free(sdp_record);
-		return g_dbus_create_error(msg,
-				ERROR_INTERFACE ".Failed",
-				strerror(EIO));
-	}
-
-	return update_record(conn, msg, src, handle, sdp_record);
-}
-
-int remove_record(DBusConnection *conn, const char *sender,
-						dbus_uint32_t handle)
-{
-	struct record_data *user_record;
-
-	debug("remove record 0x%x", handle);
-
-	user_record = find_record(handle, sender);
-	if (!user_record)
-		return -1;
-
-	debug("listner_id %d", user_record->listener_id);
-
-	g_dbus_remove_watch(conn, user_record->listener_id);
-
-	exit_callback(user_record);
-
-	return 0;
-}
diff --git a/src/dbus-database.h b/src/dbus-database.h
deleted file mode 100644
index 2f5606fc..00000000
--- a/src/dbus-database.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2007  Nokia Corporation
- *  Copyright (C) 2004-2008  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
- *
- */
-
-#define DATABASE_INTERFACE "org.bluez.Database"
-
-int add_xml_record(DBusConnection *conn, const char *sender, bdaddr_t *src,
-				const char *record, dbus_uint32_t *handle);
-DBusMessage *update_xml_record(DBusConnection *conn,
-				DBusMessage *msg, bdaddr_t *src);
-int remove_record(DBusConnection *conn, const char *sender,
-						dbus_uint32_t handle);