Make methods related to external services into service plugin.

1 files changed, 0 insertions, 213 deletions

diff --git a/src/adapter.c b/src/adapter.c
index 98dc8ce2..1f050d9b 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1908,213 +1908,6 @@ 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)
-{
-	struct adapter *adapter = data;
-	DBusMessage *reply;
-	const char *sender, *record;
-	dbus_uint32_t handle;
-	bdaddr_t src;
-	int err;
-
-	if (dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &record, DBUS_TYPE_INVALID) == FALSE)
-		return NULL;
-
-	sender = dbus_message_get_sender(msg);
-	str2ba(adapter->address, &src);
-	err = add_xml_record(conn, sender, &src, record, &handle);
-	if (err < 0)
-		return failed_strerror(msg, err);
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply)
-		return NULL;
-
-	dbus_message_append_args(reply, DBUS_TYPE_UINT32, &handle,
-							DBUS_TYPE_INVALID);
-
-	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)
-{
-	struct adapter *adapter = data;
-	bdaddr_t src;
-
-	str2ba(adapter->address, &src);
-
-	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)
-{
-	dbus_uint32_t handle;
-	const char *sender;
-
-	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT32, &handle,
-						DBUS_TYPE_INVALID) == FALSE)
-		return NULL;
-
-	sender = dbus_message_get_sender(msg);
-
-	if (remove_record(conn, sender, handle) < 0)
-		return not_available(msg);
-
-	return dbus_message_new_method_return(msg);
-}
-
-static DBusMessage *request_authorization(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	/* FIXME implement the request */
-
-	return NULL;
-}
-
-static DBusMessage *cancel_authorization(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	/* FIXME implement cancel request */
-
-	return dbus_message_new_method_return(msg);
-}
-
 /* BlueZ 4.0 API */
 static GDBusMethodTable adapter_methods[] = {
 	{ "GetProperties",	"",	"a{sv}",get_properties		},
@@ -2135,12 +1928,6 @@ static GDBusMethodTable adapter_methods[] = {
 	{ "FindDevice",		"s",	"o",	find_device		},
 	{ "RegisterAgent",	"os",	"",	register_agent		},
 	{ "UnregisterAgent",	"o",	"",	unregister_agent	},
-	{ "AddServiceRecord",	"s",	"u",	add_service_record	},
-	{ "UpdateServiceRecord","us",	"",	update_service_record	},
-	{ "RemoveServiceRecord","u",	"",	remove_service_record	},
-	{ "RequestAuthorization","su",	"",	request_authorization,
-						G_DBUS_METHOD_FLAG_ASYNC},
-	{ "CancelAuthorization","",	"",	cancel_authorization	},
 	{ }
 };