|
 |
311967 |
From c16ae7041c7511d8d1ed8441f696716fa6a9117e Mon Sep 17 00:00:00 2001
|
|
|
311967 |
From: Bastien Nocera <hadess@hadess.net>
|
|
|
311967 |
Date: Tue, 19 Nov 2013 14:11:39 +0100
|
|
|
311967 |
Subject: [PATCH 2/5] autopair: Don't handle the iCade
|
|
|
311967 |
|
|
|
311967 |
We can't easily enter digits other than 1 through 4 (inclusive)
|
|
|
311967 |
so leave it up to the agent to figure out a good passcode
|
|
|
311967 |
for the iCade.
|
|
|
311967 |
|
|
|
311967 |
Note that we can not use the VID/PID of the device, as it is not
|
|
|
311967 |
yet known at that point.
|
|
|
311967 |
---
|
|
|
311967 |
plugins/autopair.c | 12 +++++++++++-
|
|
|
311967 |
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
311967 |
|
|
|
311967 |
diff --git a/plugins/autopair.c b/plugins/autopair.c
|
|
|
311967 |
index 8c98c12..5d2f6f7 100644
|
|
|
311967 |
--- a/plugins/autopair.c
|
|
|
311967 |
+++ b/plugins/autopair.c
|
|
|
311967 |
@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
|
|
|
311967 |
{
|
|
|
311967 |
char addr[18];
|
|
|
311967 |
char pinstr[7];
|
|
|
311967 |
+ char name[25];
|
|
|
311967 |
uint32_t class;
|
|
|
311967 |
|
|
|
311967 |
ba2str(device_get_address(device), addr);
|
|
|
311967 |
|
|
|
311967 |
class = btd_device_get_class(device);
|
|
|
311967 |
|
|
|
311967 |
- DBG("device %s 0x%x", addr, class);
|
|
|
311967 |
+ device_get_name(device, name, sizeof(name));
|
|
|
311967 |
+ name[sizeof(name) - 1] = 0;
|
|
|
311967 |
+
|
|
|
311967 |
+ DBG("device %s (%s) 0x%x", addr, name, class);
|
|
|
311967 |
+
|
|
|
311967 |
+ g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device));
|
|
|
311967 |
+
|
|
|
311967 |
+ /* The iCade shouldn't use random PINs like normal keyboards */
|
|
|
311967 |
+ if (name != NULL && strstr(name, "iCade") != NULL)
|
|
|
311967 |
+ return 0;
|
|
|
311967 |
|
|
|
311967 |
/* This is a class-based pincode guesser. Ignore devices with an
|
|
|
311967 |
* unknown class.
|
|
|
311967 |
--
|
|
|
311967 |
1.8.4.2
|
|
|
311967 |
|