From: Bruna Moreira <bruna.moreira@openbossa.org>
Date: Thu, 20 Jan 2011 13:27:47 +0000 (-0400)
Subject: Fix duplicate characteristics
X-Git-Tag: android-x86-4.4-r3~14871
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ca8ed4d504acffa292263eb355e0597f77b1536;p=android-x86%2Fexternal-bluetooth-bluez.git

Fix duplicate characteristics

The Discover() operation (from DBus API) was registering the same
characteristics after running several times. This can be checked using
test-attrib.
---

diff --git a/attrib/client.c b/attrib/client.c
index 767d1c110..44638d3e6 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -870,6 +870,13 @@ static void char_discovered_cb(GSList *characteristics, guint8 status,
 	for (l = characteristics; l; l = l->next) {
 		struct att_char *current_chr = l->data;
 		struct characteristic *chr;
+		guint handle = current_chr->value_handle;
+		GSList *lchr;
+
+		lchr = g_slist_find_custom(prim->chars,
+			GUINT_TO_POINTER(handle), characteristic_handle_cmp);
+		if (lchr)
+			continue;
 
 		chr = g_new0(struct characteristic, 1);
 		chr->prim = prim;