diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-08 23:54:10 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-08 23:54:10 +0200 |
| commit | e4d0a3b9051923b015ce633f9385e5af126211fe (patch) | |
| tree | 18f5a41d529123e5409e4d8ffcbb6b4369ee8dc8 /src/device.h | |
| parent | a4145c63530b4c3575b7da5f117c0df352f939fc (diff) | |
Fix the service discovery-upon-pairing logic
The original code seems to try to handle the situation of two opposite directed
pairing attempts (remote side starts dedicated bonding with us but someone
calls CreatePairedDevice on our side at the same time). I'm not sure how likely
this actually is or if it can even succeed, but the existing logic in the code
was nevertheless wrong. After this patch is at least in theory makes sense to
me (and is better commented if I forget what I was thinking when I wrote it).
Diffstat (limited to 'src/device.h')
| -rw-r--r-- | src/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/device.h b/src/device.h index 126426df..f977d7eb 100644 --- a/src/device.h +++ b/src/device.h @@ -42,7 +42,7 @@ void device_set_temporary(struct btd_device *device, gboolean temporary); void device_set_cap(struct btd_device *device, uint8_t cap); void device_set_auth(struct btd_device *device, uint8_t auth); uint8_t device_get_auth(struct btd_device *device); -gboolean device_set_paired(DBusConnection *conn, struct btd_device *device, +int device_set_paired(DBusConnection *conn, struct btd_device *device, struct bonding_request_info *bonding); gboolean device_get_connected(struct btd_device *device); void device_set_connected(DBusConnection *conn, struct btd_device *device, |