summaryrefslogtreecommitdiffstats
path: root/src/dbus-hci.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-01-13 15:06:46 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2009-01-13 15:08:16 +0200
commit51382802f433d7ce6ee1d5ceeeb1d90d543d0e6d (patch)
treeee587a86600736dfac7be1334122ad584525db77 /src/dbus-hci.c
parentd2244495dfc50c22ce275f6194c19d3293de70cb (diff)
Fix new pairing detection with SSP
Propagate old and new link key type info to dbus-hci.c so it can know whether this is a new pairing or not.
Diffstat (limited to 'src/dbus-hci.c')
-rw-r--r--src/dbus-hci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index 5118ffc8..290bbfd6 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -916,7 +916,8 @@ proceed:
adapter_set_state(adapter, state);
}
-void hcid_dbus_link_key_notify(bdaddr_t *local, bdaddr_t *peer)
+void hcid_dbus_link_key_notify(bdaddr_t *local, bdaddr_t *peer,
+ uint8_t key_type, uint8_t old_key_type)
{
char peer_addr[18];
struct btd_device *device;
@@ -938,7 +939,7 @@ void hcid_dbus_link_key_notify(bdaddr_t *local, bdaddr_t *peer)
if (!device_is_connected(device))
device_set_secmode3_conn(device, TRUE);
- else if (!device_is_bonding(device, NULL))
+ else if (!device_is_bonding(device, NULL) && old_key_type == 0xFF)
hcid_dbus_bonding_process_complete(local, peer, 0);
}