From 19b4c8b0e51a20a1b95ede34b092ebc56e1183ae Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 16 Jun 2008 14:26:54 +0000
Subject: Allow to cancel a service discovery

---
 common/glib-helper.c | 41 +++++++++++++++++++++++++++++++++++++++++
 common/glib-helper.h |  1 +
 hcid/device.c        |  9 ++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/common/glib-helper.c b/common/glib-helper.c
index 665a1880..9d942cf9 100644
--- a/common/glib-helper.c
+++ b/common/glib-helper.c
@@ -98,10 +98,15 @@ struct search_context {
 	uuid_t			uuid;
 };
 
+static GSList *context_list = NULL;
+
 static void search_context_cleanup(struct search_context *ctxt)
 {
+	context_list = g_slist_remove(context_list, ctxt);
+
 	if (ctxt->destroy)
 		ctxt->destroy(ctxt->user_data);
+
 	g_free(ctxt);
 }
 
@@ -146,8 +151,10 @@ static void search_completed_cb(uint8_t type, uint16_t status,
 
 done:
 	sdp_close(ctxt->session);
+
 	if (ctxt->cb)
 		ctxt->cb(recs, err, ctxt->user_data);
+
 	search_context_cleanup(ctxt);
 }
 
@@ -170,8 +177,10 @@ static gboolean search_process_cb(GIOChannel *chan,
 failed:
 	if (err) {
 		sdp_close(ctxt->session);
+
 		if (ctxt->cb)
 			ctxt->cb(NULL, err, ctxt->user_data);
+
 		search_context_cleanup(ctxt);
 	}
 
@@ -222,8 +231,10 @@ static gboolean connect_watch(GIOChannel *chan, GIOCondition cond, gpointer user
 
 failed:
 	sdp_close(ctxt->session);
+
 	if (ctxt->cb)
 		ctxt->cb(NULL, -err, ctxt->user_data);
+
 	search_context_cleanup(ctxt);
 
 	return FALSE;
@@ -280,6 +291,8 @@ int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst,
 	ctxt->destroy	= destroy;
 	ctxt->user_data	= user_data;
 
+	context_list = g_slist_append(context_list, ctxt);
+
 	return 0;
 }
 
@@ -293,6 +306,33 @@ int bt_discover_services(const bdaddr_t *src, const bdaddr_t *dst,
 	return bt_search_service(src, dst, &uuid, cb, user_data, destroy);
 }
 
+static int find_by_bdaddr(const void *data, const void *user_data)
+{
+	const struct search_context *ctxt = data, *search = user_data;
+
+	return (bacmp(&ctxt->dst, &search->dst) &&
+					bacmp(&ctxt->src, &search->src));
+}
+
+void bt_cancel_discovery(const bdaddr_t *src, const bdaddr_t *dst)
+{
+	struct search_context search, *ctxt;
+	GSList *match;
+
+	memset(&search, 0, sizeof(search));
+	bacpy(&search.src, src);
+	bacpy(&search.dst, dst);
+
+	match = g_slist_find_custom(context_list, &search, find_by_bdaddr);
+
+	/* Ongoing SDP Discovery */
+	if (match) {
+		ctxt = match->data;
+		if (ctxt->session) 
+			close(ctxt->session->sock);
+	}
+}
+
 char *bt_uuid2string(uuid_t *uuid)
 {
 	gchar *str;
@@ -1159,6 +1199,7 @@ gboolean bt_io_set_psm(BtIO *io, guint16 psm)
 
 	return TRUE;
 }
+
 guint16 bt_io_get_psm(BtIO *io)
 {
 	return io->psm;
diff --git a/common/glib-helper.h b/common/glib-helper.h
index 0919fe97..6c9b89b0 100644
--- a/common/glib-helper.h
+++ b/common/glib-helper.h
@@ -34,6 +34,7 @@ int bt_discover_services(const bdaddr_t *src, const bdaddr_t *dst,
 int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst,
 			uuid_t *uuid, bt_callback_t cb, void *user_data,
 			bt_destroy_t destroy);
+void bt_cancel_discovery(const bdaddr_t *src, const bdaddr_t *dst);
 
 gchar *bt_uuid2string(uuid_t *uuid);
 int bt_string2uuid(uuid_t *uuid, const char *string);
diff --git a/hcid/device.c b/hcid/device.c
index a9a937c6..5c7584f2 100644
--- a/hcid/device.c
+++ b/hcid/device.c
@@ -1054,7 +1054,14 @@ static DBusMessage *discover_services(DBusConnection *conn,
 static DBusMessage *cancel_discover(DBusConnection *conn,
 					DBusMessage *msg, void *user_data)
 {
-	/* FIXME cancel discovery */
+	struct device *device = user_data;
+	struct adapter *adapter = device->adapter;
+	bdaddr_t src,dst;
+
+	str2ba(adapter->address, &src);
+	str2ba(device->address, &dst);
+
+	bt_cancel_discovery(&src, &dst);
 
 	return dbus_message_new_method_return(msg);
 }
-- 
cgit