From 6de9406187e196b23fa29e1dc34859011ad1f789 Mon Sep 17 00:00:00 2001
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
Date: Wed, 7 Jun 2006 22:40:21 +0000
Subject: PIN code request timeout: replaced disconnect by PIN code negative
 reply cmd

---
 hcid/dbus-adapter.c | 25 ++++++++-----------------
 hcid/dbus.c         |  1 +
 hcid/dbus.h         |  1 +
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 3b56ced4..13634390 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -1555,27 +1555,19 @@ static DBusHandlerResult handle_dev_disconnect_remote_device_req(DBusConnection
 static int bonding_timeout_handler(void *data)
 {
 	struct hci_dbus_data *dbus_data = data;
-	struct active_conn_info *con;
-	struct slist *l;
 	int dd = -1;
 
-	if (!dbus_data->bonding || !dbus_data->bonding->disconnect)
-		return -1;
-
-	l = slist_find(dbus_data->active_conn, &dbus_data->bonding->bdaddr, active_conn_find_by_bdaddr);
-	if (!l)
+	if (!dbus_data->bonding)
 		return -1;
 
-	con = l->data;
-
 	dd = hci_open_dev(dbus_data->dev_id);
 	if (dd < 0) {
 		error("HCI device open failed: hci%d", dbus_data->dev_id);
 		return -1;
 	}
 
-	if (hci_disconnect(dd, htobs(con->handle), HCI_AUTHENTICATION_FAILURE, 1000) < 0)
-		error("Disconnect failed");
+	hci_send_cmd(dd, OGF_LINK_CTL, OCF_PIN_CODE_NEG_REPLY, HCI_PIN_OR_KEY_MISSING,
+			&dbus_data->bonding->bdaddr);
 
 	if (dd >= 0)
 		close(dd);
@@ -1695,16 +1687,15 @@ static DBusHandlerResult handle_dev_create_bonding_req(DBusConnection *conn, DBu
 	dbus_data->bonding = bonding_request_new(&peer_bdaddr);
 	dbus_data->bonding->disconnect = disconnect;
 	dbus_data->bonding->rq = dbus_message_ref(msg);
-
-	dbus_data->requestor_name = strdup(dbus_message_get_sender(msg));
-
-	hci_close_dev(dd);
-
         /*
 	 * Create a timeout to disconnect automatically if no passkey is provided
 	 * Broadcom chips doesn't handle timeout for PIN code request command
 	 */
-	g_timeout_add(BONDING_TIMEOUT, bonding_timeout_handler, dbus_data);
+	dbus_data->bonding->timeout = g_timeout_add(BONDING_TIMEOUT, bonding_timeout_handler, dbus_data);
+
+	dbus_data->requestor_name = strdup(dbus_message_get_sender(msg));
+
+	hci_close_dev(dd);
 
 	return DBUS_HANDLER_RESULT_HANDLED;
 }
diff --git a/hcid/dbus.c b/hcid/dbus.c
index 274dd8d8..c3e8a6ba 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -79,6 +79,7 @@ void bonding_request_free(struct bonding_request_info *dev )
 			dbus_message_unref(dev->rq);
 		if (dev->cancel)
 			dbus_message_unref(dev->cancel);
+		g_timeout_remove(dev->timeout);
 		free(dev);
 	}
 }
diff --git a/hcid/dbus.h b/hcid/dbus.h
index d032f16b..5e6927b6 100644
--- a/hcid/dbus.h
+++ b/hcid/dbus.h
@@ -88,6 +88,7 @@ struct bonding_request_info {
 	DBusMessage *rq;
 	DBusMessage *cancel;
 	int disconnect; /* disconnect after finish */
+	int timeout; /* timeout id */
 };
 
 struct active_conn_info {
-- 
cgit