* [PATCH] android/pixit: correct PIXIT value
From: Sebastian Chlad @ 2014-02-19 14:04 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Sebastian Chlad
It is important for NAP role to set proper PTS btaddr in PIXIT
---
android/pixit-pan.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/pixit-pan.txt b/android/pixit-pan.txt
index 6544a9c..21434fb 100644
--- a/android/pixit-pan.txt
+++ b/android/pixit-pan.txt
@@ -3,7 +3,7 @@ PAN PIXIT for the PTS tool.
PTS version: 5.0
* - different than PTS defaults
-& - should be set to IUT Bluetooth address
+& - should be set to IUT or PTS Bluetooth address respectively
Required PIXIT settings
-------------------------------------------------------------------------------
@@ -22,7 +22,7 @@ TSPX_iut_ip_address 192.168.167.152
TSPX_iut_port_number 4242
TSPX_PTS_ip_address 192.168.168.100
TSPX_PTS_port_number 4242
-TSPX_bd_addr_PTS 000000000000
+TSPX_bd_addr_PTS 112233445566 (*&)
TSPX_checksum E851
TSPX_secure_simple_pairing_pass_key_confirmation False
TSPX_iut_friendly_bt_name gprs-pc
--
1.8.5.3
^ permalink raw reply related
* [RFCv2 11/11] android/tester: Execute hh virtual unplug cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:55 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic HIDHost virtual_unplug_cb in tester's main loop.
---
android/android-tester.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index feddd8f..0cd130d 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -3253,15 +3253,30 @@ static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr,
g_idle_add(hidhost_connection_state, cb_data);
}
-static void hidhost_virual_unplug_cb(bt_bdaddr_t *bd_addr, bthh_status_t status)
+static gboolean hidhost_virual_unplug(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct hidhost_generic_data *test = data->test_data;
+ struct hh_cb_data *cb_data = user_data;
data->cb_count++;
if (test && test->expected_hal_cb.virtual_unplug_cb)
- test->expected_hal_cb.virtual_unplug_cb(bd_addr, status);
+ test->expected_hal_cb.virtual_unplug_cb(&cb_data->bdaddr,
+ cb_data->status);
+
+ g_free(cb_data);
+ return FALSE;
+}
+
+static void hidhost_virual_unplug_cb(bt_bdaddr_t *bd_addr, bthh_status_t status)
+{
+ struct hh_cb_data *cb_data = g_new0(struct hh_cb_data, 1);
+
+ cb_data->bdaddr = *bd_addr;
+ cb_data->status = status;
+
+ g_idle_add(hidhost_virual_unplug, cb_data);
}
static gboolean hidhost_hid_info(gpointer user_data)
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 10/11] android/tester: Execute hh report cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:55 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute HIDHost generic get_report_cb in tester's main loop.
---
android/android-tester.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 4789844..feddd8f 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -3319,17 +3319,34 @@ static void hidhost_protocol_mode_cb(bt_bdaddr_t *bd_addr,
g_idle_add(hidhost_protocol_mode, cb_data);
}
-static void hidhost_get_report_cb(bt_bdaddr_t *bd_addr, bthh_status_t status,
- uint8_t *report, int size)
+static gboolean hidhost_get_report(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct hidhost_generic_data *test = data->test_data;
+ struct hh_cb_data *cb_data = user_data;
data->cb_count++;
if (test && test->expected_hal_cb.get_report_cb)
- test->expected_hal_cb.get_report_cb(bd_addr, status, report,
- size);
+ test->expected_hal_cb.get_report_cb(&cb_data->bdaddr,
+ cb_data->status, cb_data->report, cb_data->size);
+
+ g_free(cb_data->report);
+ g_free(cb_data);
+ return FALSE;
+}
+
+static void hidhost_get_report_cb(bt_bdaddr_t *bd_addr, bthh_status_t status,
+ uint8_t *report, int size)
+{
+ struct hh_cb_data *cb_data = g_new0(struct hh_cb_data, 1);
+
+ cb_data->bdaddr = *bd_addr;
+ cb_data->status = status;
+ cb_data->report = g_memdup(report, size);
+ cb_data->size = size;
+
+ g_idle_add(hidhost_get_report, cb_data);
}
static bthh_callbacks_t bthh_callbacks = {
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 09/11] android/tester: Execute hh protocol mode cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:55 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic HIDHost protocol_mode_cb in tester's main loop.
---
android/android-tester.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 116593d..4789844 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -3290,17 +3290,33 @@ static void hidhost_hid_info_cb(bt_bdaddr_t *bd_addr, bthh_hid_info_t hid)
g_idle_add(hidhost_hid_info, cb_data);
}
-static void hidhost_protocol_mode_cb(bt_bdaddr_t *bd_addr,
- bthh_status_t status,
- bthh_protocol_mode_t mode)
+static gboolean hidhost_protocol_mode(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct hidhost_generic_data *test = data->test_data;
+ struct hh_cb_data *cb_data = user_data;
data->cb_count++;
if (test && test->expected_hal_cb.protocol_mode_cb)
- test->expected_hal_cb.protocol_mode_cb(bd_addr, status, mode);
+ test->expected_hal_cb.protocol_mode_cb(&cb_data->bdaddr,
+ cb_data->status, cb_data->mode);
+
+ g_free(cb_data);
+ return FALSE;
+}
+
+static void hidhost_protocol_mode_cb(bt_bdaddr_t *bd_addr,
+ bthh_status_t status,
+ bthh_protocol_mode_t mode)
+{
+ struct hh_cb_data *cb_data = g_new0(struct hh_cb_data, 1);
+
+ cb_data->bdaddr = *bd_addr;
+ cb_data->status = status;
+ cb_data->mode = mode;
+
+ g_idle_add(hidhost_protocol_mode, cb_data);
}
static void hidhost_get_report_cb(bt_bdaddr_t *bd_addr, bthh_status_t status,
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 08/11] android/tester: Execute hh info cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic HIDHost hid_info_cb in tester's main loop.
---
android/android-tester.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 73b25a5..116593d 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -3264,15 +3264,30 @@ static void hidhost_virual_unplug_cb(bt_bdaddr_t *bd_addr, bthh_status_t status)
test->expected_hal_cb.virtual_unplug_cb(bd_addr, status);
}
-static void hidhost_hid_info_cb(bt_bdaddr_t *bd_addr, bthh_hid_info_t hid)
+static gboolean hidhost_hid_info(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct hidhost_generic_data *test = data->test_data;
+ struct hh_cb_data *cb_data = user_data;
data->cb_count++;
if (test && test->expected_hal_cb.hid_info_cb)
- test->expected_hal_cb.hid_info_cb(bd_addr, hid);
+ test->expected_hal_cb.hid_info_cb(&cb_data->bdaddr,
+ cb_data->hid_info);
+
+ g_free(cb_data);
+ return FALSE;
+}
+
+static void hidhost_hid_info_cb(bt_bdaddr_t *bd_addr, bthh_hid_info_t hid)
+{
+ struct hh_cb_data *cb_data = g_new0(struct hh_cb_data, 1);
+
+ cb_data->bdaddr = *bd_addr;
+ cb_data->hid_info = hid;
+
+ g_idle_add(hidhost_hid_info, cb_data);
}
static void hidhost_protocol_mode_cb(bt_bdaddr_t *bd_addr,
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 07/11] android/tester: Execute hh connection state cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic HIDHost connection_state_cb in tester's main loop.
---
android/android-tester.c | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 71957ec..73b25a5 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -127,6 +127,18 @@ struct bt_cb_data {
bt_property_t *props;
};
+struct hh_cb_data {
+ bt_bdaddr_t bdaddr;
+
+ bthh_status_t status;
+ bthh_hid_info_t hid_info;
+ bthh_protocol_mode_t mode;
+ bthh_connection_state_t state;
+
+ uint8_t *report;
+ int size;
+};
+
static char exec_dir[PATH_MAX + 1];
static void mgmt_debug(const char *str, void *user_data)
@@ -3211,19 +3223,34 @@ clean:
close(sock_fd);
}
-static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr,
- bthh_connection_state_t state)
+static gboolean hidhost_connection_state(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct hidhost_generic_data *test = data->test_data;
+ struct hh_cb_data *cb_data = user_data;
data->cb_count++;
- if (state == BTHH_CONN_STATE_CONNECTED)
+ if (cb_data->state == BTHH_CONN_STATE_CONNECTED)
tester_setup_complete();
if (test && test->expected_hal_cb.connection_state_cb)
- test->expected_hal_cb.connection_state_cb(bd_addr, state);
+ test->expected_hal_cb.connection_state_cb(&cb_data->bdaddr,
+ cb_data->state);
+
+ g_free(cb_data);
+ return FALSE;
+}
+
+static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr,
+ bthh_connection_state_t state)
+{
+ struct hh_cb_data *cb_data = g_new0(struct hh_cb_data, 1);
+
+ cb_data->state = state;
+ cb_data->bdaddr = *bd_addr;
+
+ g_idle_add(hidhost_connection_state, cb_data);
}
static void hidhost_virual_unplug_cb(bt_bdaddr_t *bd_addr, bthh_status_t status)
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 06/11] android/tester: Execute socket cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute socket test's callbacks in tester's main loop.
---
android/android-tester.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 0425b86..71957ec 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -2779,9 +2779,11 @@ static void test_dev_setprop_disctimeout_fail(const void *test_data)
}
/* Test Socket HAL */
-static void adapter_socket_state_changed_cb(bt_state_t state)
+static gboolean adapter_socket_state_changed(gpointer user_data)
{
- switch (state) {
+ struct bt_cb_data *cb_data = user_data;
+
+ switch (cb_data->state) {
case BT_STATE_ON:
setup_powered_emulated_remote();
break;
@@ -2791,6 +2793,19 @@ static void adapter_socket_state_changed_cb(bt_state_t state)
default:
break;
}
+
+ g_free(cb_data);
+
+ return FALSE;
+}
+
+static void adapter_socket_state_changed_cb(bt_state_t state)
+{
+ struct bt_cb_data *cb_data = g_new0(struct bt_cb_data, 1);
+
+ cb_data->state = state;
+
+ g_idle_add(adapter_socket_state_changed, cb_data);
}
const bt_bdaddr_t bdaddr_dummy = {
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 05/11] android/tester: Execute adapter state changed cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic adapter_state_changed_cb in tester's main loop.
---
android/android-tester.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index b542a1f..0425b86 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -599,19 +599,33 @@ static void disable_success_cb(bt_state_t state)
}
}
-static void adapter_state_changed_cb(bt_state_t state)
+static gboolean adapter_state_changed(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct generic_data *test = data->test_data;
+ struct bt_cb_data *cb_data = user_data;
if (data->test_init_done &&
test->expected_hal_cb.adapter_state_changed_cb) {
- test->expected_hal_cb.adapter_state_changed_cb(state);
- return;
+ test->expected_hal_cb.adapter_state_changed_cb(cb_data->state);
+ goto cleanup;
}
- if (!data->test_init_done && state == BT_STATE_ON)
+ if (!data->test_init_done && cb_data->state == BT_STATE_ON)
setup_powered_emulated_remote();
+
+cleanup:
+ g_free(cb_data);
+ return FALSE;
+}
+
+static void adapter_state_changed_cb(bt_state_t state)
+{
+ struct bt_cb_data *cb_data = g_new0(struct bt_cb_data, 1);
+
+ cb_data->state = state;
+
+ g_idle_add(adapter_state_changed, cb_data);
}
static void discovery_start_success_cb(bt_discovery_state_t state)
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 04/11] android/tester: Execute adapter props cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic adapter_properties_cb in tester's main loop.
---
android/android-tester.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index d909390..b542a1f 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -915,19 +915,32 @@ static void check_count_properties_cb(bt_status_t status, int num_properties,
check_expected_property(properties[i]);
}
+static gboolean adapter_properties(gpointer user_data)
+{
+ struct test_data *data = tester_get_data();
+ const struct generic_data *test = data->test_data;
+ struct bt_cb_data *cb_data = user_data;
+
+ if (data->test_init_done && test->expected_hal_cb.adapter_properties_cb)
+ test->expected_hal_cb.adapter_properties_cb(cb_data->status,
+ cb_data->num, cb_data->props);
+
+ free_properties(cb_data->num, cb_data->props);
+ g_free(cb_data);
+
+ return FALSE;
+}
static void adapter_properties_cb(bt_status_t status, int num_properties,
bt_property_t *properties)
{
- struct test_data *data = tester_get_data();
- const struct generic_data *test = data->test_data;
+ struct bt_cb_data *cb_data = g_new0(struct bt_cb_data, 1);
- if (data->test_init_done &&
- test->expected_hal_cb.adapter_properties_cb) {
- test->expected_hal_cb.adapter_properties_cb(
- status, num_properties,
- properties);
- }
+ cb_data->status = status;
+ cb_data->num = num_properties;
+ cb_data->props = copy_properties(num_properties, properties);
+
+ g_idle_add(adapter_properties, cb_data);
}
static void remote_test_device_properties_cb(bt_status_t status,
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 03/11] android/tester: Execute device properties cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic remote_device_properties_cb in tester's main loop.
---
android/android-tester.c | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index a3b7ead..d909390 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -963,18 +963,36 @@ static void remote_setprop_device_properties_cb(bt_status_t status,
}
}
-static void remote_device_properties_cb(bt_status_t status,
- bt_bdaddr_t *bd_addr, int num_properties,
- bt_property_t *properties)
+static gboolean remote_device_properties(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct generic_data *test = data->test_data;
+ struct bt_cb_data *cb_data = user_data;
if (data->test_init_done &&
- test->expected_hal_cb.remote_device_properties_cb) {
- test->expected_hal_cb.remote_device_properties_cb(status,
- bd_addr, num_properties, properties);
- }
+ test->expected_hal_cb.remote_device_properties_cb)
+ test->expected_hal_cb.remote_device_properties_cb(
+ cb_data->status, &cb_data->bdaddr,
+ cb_data->num, cb_data->props);
+
+ free_properties(cb_data->num, cb_data->props);
+ g_free(cb_data);
+
+ return FALSE;
+}
+
+static void remote_device_properties_cb(bt_status_t status,
+ bt_bdaddr_t *bd_addr, int num_properties,
+ bt_property_t *properties)
+{
+ struct bt_cb_data *cb_data = g_new0(struct bt_cb_data, 1);
+
+ cb_data->status = status;
+ cb_data->bdaddr = *bd_addr;
+ cb_data->num = num_properties;
+ cb_data->props = copy_properties(num_properties, properties);
+
+ g_idle_add(remote_device_properties, cb_data);
}
static bt_bdaddr_t enable_done_bdaddr_val = { {0x00} };
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 02/11] android/tester: Execute discovery state cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic discovery_state_changed_cb in tester's main loop.
---
android/android-tester.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 9966a6f..a3b7ead 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -695,14 +695,27 @@ static void remote_setprop_disc_state_changed_cb(bt_discovery_state_t state)
}
}
-static void discovery_state_changed_cb(bt_discovery_state_t state)
+static gboolean discovery_state_changed(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct generic_data *test = data->test_data;
+ struct bt_cb_data *cb_data = user_data;
- if (test && test->expected_hal_cb.discovery_state_changed_cb) {
- test->expected_hal_cb.discovery_state_changed_cb(state);
- }
+ if (test && test->expected_hal_cb.discovery_state_changed_cb)
+ test->expected_hal_cb.discovery_state_changed_cb(
+ cb_data->state);
+
+ g_free(cb_data);
+
+ return FALSE;
+}
+
+static void discovery_state_changed_cb(bt_discovery_state_t state)
+{
+ struct bt_cb_data *cb_data = g_new0(struct bt_cb_data, 1);
+
+ cb_data->state = state;
+ g_idle_add(discovery_state_changed, cb_data);
}
static bt_property_t *copy_properties(int num_properties,
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 01/11] android/tester: Execute device found cbacks in main loop
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392818102-19189-1-git-send-email-jakub.tyszkowski@tieto.com>
Execute generic device_found_cb in tester's main loop.
---
android/android-tester.c | 60 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 55 insertions(+), 5 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 9605c4d..9966a6f 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -117,6 +117,16 @@ struct test_data {
uint16_t intr_cid;
};
+struct bt_cb_data {
+ bt_state_t state;
+ bt_status_t status;
+
+ bt_bdaddr_t bdaddr;
+
+ int num;
+ bt_property_t *props;
+};
+
static char exec_dir[PATH_MAX + 1];
static void mgmt_debug(const char *str, void *user_data)
@@ -695,6 +705,31 @@ static void discovery_state_changed_cb(bt_discovery_state_t state)
}
}
+static bt_property_t *copy_properties(int num_properties,
+ bt_property_t *properties)
+{
+ int i;
+ bt_property_t *props = g_new0(bt_property_t, num_properties);
+
+ for (i = 0; i < num_properties; i++) {
+ props[i].type = properties[i].type;
+ props[i].len = properties[i].len;
+ props[i].val = g_memdup(properties[i].val, properties[i].len);
+ }
+
+ return props;
+}
+
+static void free_properties(int num_properties, bt_property_t *properties)
+{
+ int i;
+
+ for (i = 0; i < num_properties; i++)
+ g_free(properties[i].val);
+
+ g_free(properties);
+}
+
static void discovery_device_found_cb(int num_properties,
bt_property_t *properties)
{
@@ -832,15 +867,30 @@ static void remote_setprop_fail_device_found_cb(int num_properties,
check_expected_status(status);
}
-static void device_found_cb(int num_properties, bt_property_t *properties)
+static gboolean device_found(gpointer user_data)
{
struct test_data *data = tester_get_data();
const struct generic_data *test = data->test_data;
+ struct bt_cb_data *cb_data = user_data;
- if (data->test_init_done && test->expected_hal_cb.device_found_cb) {
- test->expected_hal_cb.device_found_cb(num_properties,
- properties);
- }
+ if (data->test_init_done && test->expected_hal_cb.device_found_cb)
+ test->expected_hal_cb.device_found_cb(cb_data->num,
+ cb_data->props);
+
+ free_properties(cb_data->num, cb_data->props);
+ g_free(cb_data);
+
+ return FALSE;
+}
+
+static void device_found_cb(int num_properties, bt_property_t *properties)
+{
+ struct bt_cb_data *cb_data = g_new0(struct bt_cb_data, 1);
+
+ cb_data->num = num_properties;
+ cb_data->props = copy_properties(num_properties, properties);
+
+ g_idle_add(device_found, cb_data);
}
static void check_count_properties_cb(bt_status_t status, int num_properties,
--
1.8.5.2
^ permalink raw reply related
* [RFCv2 00/11] Make android-tester callbacks thread safe
From: Jakub Tyszkowski @ 2014-02-19 13:54 UTC (permalink / raw)
To: linux-bluetooth
This patch set makes all callbacks executions in HAL's notification thread being
transfered to tester's context. As test-specific callbacks are called by generic
callbacks, making the later executed in tester's main loop makes all custom
callbacks (and newly added) automatically executed in the right contex.
Forking out the emulator to be controlled over IPC makes finer controll harder
and requires IPC extensions when new functionality is required. It also adds
extra complexity.
Our initial 'IPC' solution creates additional ~800 lines of code to maintain in
comparison to ~260 added by this simplier 'main loop' solution.
Please state your's opinions on these options.
v2 changes:
* Replaced generic callback data structure with per HAL structures for clarity
and to avoid type casting of reused data fields
* Fixed passing report data in HID callback
Best regards,
Jakub Tyszkowski (11):
android/tester: Execute device found cbacks in main loop
android/tester: Execute discovery state cbacks in main loop
android/tester: Execute device properties cbacks in main loop
android/tester: Execute adapter props cbacks in main loop
android/tester: Execute adapter state changed cbacks in main loop
android/tester: Execute socket cbacks in main loop
android/tester: Execute hh connection state cbacks in main loop
android/tester: Execute hh info cbacks in main loop
android/tester: Execute hh protocol mode cbacks in main loop
android/tester: Execute hh report cbacks in main loop
android/tester: Execute hh virtual unplug cbacks in main loop
android/android-tester.c | 303 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 258 insertions(+), 45 deletions(-)
--
1.8.5.2
^ permalink raw reply
* [PATCHv2] emulator/bthost: Fix command queue
From: Marcin Kraglak @ 2014-02-19 13:39 UTC (permalink / raw)
To: linux-bluetooth
Now new commands will be pushed to tail. Queue will be consumed
from head, firstly added commands will be sent. It repairs this
warning from android-tester:
==20561== 1,904 bytes in 7 blocks are definitely
lost in loss record 30 of 31
==20561== at 0x4006AB1: malloc (in /usr/lib/valgrind/
vgpreload_memcheck-x86-linux.so)
==20561== by 0x8050293: send_command (bthost.c:389)
==20561== by 0x80543E1: start_stack (hciemu.c:299)
==20561== by 0x41043D00: ??? (in /usr/lib/libglib-2.0.so.0.3600.4)
==20561== by 0x410470E5: g_main_context_dispatch (in
/usr/lib/libglib-2.0.so.0.3600.4)
==20561== by 0x41047497: ??? (in
/usr/lib/libglib-2.0.so.0.3600.4)
==20561== by 0x41047912: g_main_loop_run (in
/usr/lib/libglib-2.0.so.0.3600.4)
==20561== by 0x8055870: tester_run (tester.c:798)
==20561== by 0x804B980: main (android-tester.c:3984)
---
emulator/bthost.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/emulator/bthost.c b/emulator/bthost.c
index fe78ec5..2f338f7 100644
--- a/emulator/bthost.c
+++ b/emulator/bthost.c
@@ -395,7 +395,7 @@ void bthost_destroy(struct bthost *bthost)
while (bthost->cmd_q.tail) {
struct cmd *cmd = bthost->cmd_q.tail;
- bthost->cmd_q.tail = cmd->next;
+ bthost->cmd_q.tail = cmd->prev;
free(cmd);
}
@@ -461,6 +461,8 @@ static void queue_command(struct bthost *bthost, const void *data,
if (cmd_q->tail)
cmd_q->tail->next = cmd;
+ else
+ cmd_q->head = cmd;
cmd->prev = cmd_q->tail;
cmd_q->tail = cmd;
@@ -662,7 +664,7 @@ static void send_command(struct bthost *bthost, uint16_t opcode,
static void next_cmd(struct bthost *bthost)
{
struct cmd_queue *cmd_q = &bthost->cmd_q;
- struct cmd *cmd = cmd_q->tail;
+ struct cmd *cmd = cmd_q->head;
struct cmd *next;
if (!cmd)
@@ -678,8 +680,10 @@ static void next_cmd(struct bthost *bthost)
if (next)
next->prev = NULL;
+ else
+ cmd_q->tail = NULL;
- cmd_q->tail = next;
+ cmd_q->head = next;
free(cmd);
}
--
1.8.3.1
^ permalink raw reply related
* [PATCH v2 6/6] Bluetooth: Add support for sending New IRK event
From: johan.hedberg @ 2014-02-19 13:18 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-7-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
This patch adds the necessary helper function to send the New IRK mgmt
event and makes sure that the function is called at when SMP key
distribution has completed. The event is sent before the New LTK event
so user space knows which remote device to associate with the keys.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
v2: Fix checking for correct irk variable before calling mgmt_new_irk
include/net/bluetooth/hci_core.h | 1 +
include/net/bluetooth/mgmt.h | 7 +++++++
net/bluetooth/mgmt.c | 15 +++++++++++++++
net/bluetooth/smp.c | 3 +++
4 files changed, 26 insertions(+)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 59ae04c2684f..3be2905010cd 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1211,6 +1211,7 @@ void mgmt_discovering(struct hci_dev *hdev, u8 discovering);
int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key);
+void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk);
void mgmt_reenable_advertising(struct hci_dev *hdev);
void mgmt_smp_complete(struct hci_conn *conn, bool complete);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index e4fa13e559e2..2e46251e8aec 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -536,3 +536,10 @@ struct mgmt_ev_passkey_notify {
__le32 passkey;
__u8 entered;
} __packed;
+
+#define MGMT_EV_NEW_IRK 0x0018
+struct mgmt_ev_new_irk {
+ __u8 store_hint;
+ bdaddr_t rpa;
+ struct mgmt_irk_info irk;
+} __packed;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bcfc6da67a5c..1daa837da091 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4792,6 +4792,21 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key)
mgmt_event(MGMT_EV_NEW_LONG_TERM_KEY, hdev, &ev, sizeof(ev), NULL);
}
+void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk)
+{
+ struct mgmt_ev_new_irk ev;
+
+ memset(&ev, 0, sizeof(ev));
+
+ ev.store_hint = 0x01;
+ bacpy(&ev.rpa, &irk->rpa);
+ bacpy(&ev.irk.addr.bdaddr, &irk->bdaddr);
+ ev.irk.addr.type = link_to_bdaddr(LE_LINK, irk->addr_type);
+ memcpy(ev.irk.val, irk->val, sizeof(irk->val));
+
+ mgmt_event(MGMT_EV_NEW_IRK, hdev, &ev, sizeof(ev), NULL);
+}
+
static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,
u8 data_len)
{
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index f05c1b71d99a..f06068072bdd 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1112,6 +1112,9 @@ static void smp_notify_keys(struct l2cap_conn *conn)
struct hci_conn *hcon = conn->hcon;
struct hci_dev *hdev = hcon->hdev;
+ if (smp->remote_irk)
+ mgmt_new_irk(hdev, smp->remote_irk);
+
if (smp->ltk) {
smp->ltk->bdaddr_type = hcon->dst_type;
bacpy(&smp->ltk->bdaddr, &hcon->dst);
--
1.8.5.3
^ permalink raw reply related
* Re: [PATCHv2 0/6] RFCOMM data transfer support in bthost
From: Johan Hedberg @ 2014-02-19 13:12 UTC (permalink / raw)
To: Marcin Kraglak; +Cc: linux-bluetooth
In-Reply-To: <1392709855-32600-1-git-send-email-marcin.kraglak@tieto.com>
Hi Marcin,
On Tue, Feb 18, 2014, Marcin Kraglak wrote:
> v2:
> - Added rfcomm prefixes in API functions and internal structs
> - Values returned by read() and write stored in local variables
> for clarity
> - Few coding style fixes
>
> Marcin Kraglak (6):
> emulator/bthost: Add api to handle RFCOMM data on bthost
> tools/rfcomm-tester: Add RFCOMM client write test case
> tools/rfcomm-tester: Add RFCOMM server write test case
> emulator/bthost: Add function to send RFCOMM UIH frames from bthost
> tools/rfcomm-tester: Add RFCOMM client read test case
> tools/rfcomm-tester: Add RFCOMM server read test case
>
> emulator/bthost.c | 167 ++++++++++++++++++++++++++++++++++++++-
> emulator/bthost.h | 13 ++++
> tools/rfcomm-tester.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++-
> 3 files changed, 387 insertions(+), 5 deletions(-)
All patches in this set have been applied. I also applied a couple of
extra cleanup/fix patches on top of it to avoid yet another review
round.
Johan
^ permalink raw reply
* [PATCH 6/6] Bluetooth: Add support for sending New IRK event
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
This patch adds the necessary helper function to send the New IRK mgmt
event and makes sure that the function is called at when SMP key
distribution has completed. The event is sent before the New LTK event
so user space knows which remote device to associate with the keys.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 1 +
include/net/bluetooth/mgmt.h | 7 +++++++
net/bluetooth/mgmt.c | 15 +++++++++++++++
net/bluetooth/smp.c | 3 +++
4 files changed, 26 insertions(+)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 59ae04c2684f..3be2905010cd 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1211,6 +1211,7 @@ void mgmt_discovering(struct hci_dev *hdev, u8 discovering);
int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key);
+void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk);
void mgmt_reenable_advertising(struct hci_dev *hdev);
void mgmt_smp_complete(struct hci_conn *conn, bool complete);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index e4fa13e559e2..2e46251e8aec 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -536,3 +536,10 @@ struct mgmt_ev_passkey_notify {
__le32 passkey;
__u8 entered;
} __packed;
+
+#define MGMT_EV_NEW_IRK 0x0018
+struct mgmt_ev_new_irk {
+ __u8 store_hint;
+ bdaddr_t rpa;
+ struct mgmt_irk_info irk;
+} __packed;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bcfc6da67a5c..1daa837da091 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4792,6 +4792,21 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key)
mgmt_event(MGMT_EV_NEW_LONG_TERM_KEY, hdev, &ev, sizeof(ev), NULL);
}
+void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk)
+{
+ struct mgmt_ev_new_irk ev;
+
+ memset(&ev, 0, sizeof(ev));
+
+ ev.store_hint = 0x01;
+ bacpy(&ev.rpa, &irk->rpa);
+ bacpy(&ev.irk.addr.bdaddr, &irk->bdaddr);
+ ev.irk.addr.type = link_to_bdaddr(LE_LINK, irk->addr_type);
+ memcpy(ev.irk.val, irk->val, sizeof(irk->val));
+
+ mgmt_event(MGMT_EV_NEW_IRK, hdev, &ev, sizeof(ev), NULL);
+}
+
static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,
u8 data_len)
{
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index f05c1b71d99a..e3794592fa66 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1112,6 +1112,9 @@ static void smp_notify_keys(struct l2cap_conn *conn)
struct hci_conn *hcon = conn->hcon;
struct hci_dev *hdev = hcon->hdev;
+ if (smp->irk)
+ mgmt_new_irk(hdev, smp->remote_irk);
+
if (smp->ltk) {
smp->ltk->bdaddr_type = hcon->dst_type;
bacpy(&smp->ltk->bdaddr, &hcon->dst);
--
1.8.5.3
^ permalink raw reply related
* [PATCH 5/6] Bluetooth: Move SMP LTK notification after key distribution
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
This patch moves the SMP Long Term Key notification over mgmt from the
hci_add_ltk function to smp.c when both sides have completed their key
distribution. This way we are also able to update the identity address
into the mgmt_new_ltk event.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 5 ++---
net/bluetooth/hci_core.c | 11 ++---------
net/bluetooth/mgmt.c | 6 +++---
net/bluetooth/smp.c | 29 ++++++++++++++++++++++++-----
4 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 8ca95e5e3765..59ae04c2684f 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -788,9 +788,8 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8],
bool master);
struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
- u8 addr_type, u8 type, int new_key,
- u8 authenticated, u8 tk[16], u8 enc_size,
- __le16 ediv, u8 rand[8]);
+ u8 addr_type, u8 type, u8 authenticated,
+ u8 tk[16], u8 enc_size, __le16 ediv, u8 rand[8]);
struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 addr_type, bool master);
int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 60c875267c19..3711c7626cb2 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2762,9 +2762,8 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
}
struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
- u8 addr_type, u8 type, int new_key,
- u8 authenticated, u8 tk[16], u8 enc_size,
- __le16 ediv, u8 rand[8])
+ u8 addr_type, u8 type, u8 authenticated,
+ u8 tk[16], u8 enc_size, __le16 ediv, u8 rand[8])
{
struct smp_ltk *key, *old_key;
bool master = ltk_type_master(type);
@@ -2788,12 +2787,6 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
key->type = type;
memcpy(key->rand, rand, sizeof(key->rand));
- if (!new_key)
- return key;
-
- if (type == HCI_SMP_LTK || type == HCI_SMP_LTK_SLAVE)
- mgmt_new_ltk(hdev, key);
-
return key;
}
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ad51da1b6dc2..bcfc6da67a5c 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4330,9 +4330,9 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
else
type = HCI_SMP_LTK_SLAVE;
- hci_add_ltk(hdev, &key->addr.bdaddr, addr_type,
- type, 0, key->type, key->val,
- key->enc_size, key->ediv, key->rand);
+ hci_add_ltk(hdev, &key->addr.bdaddr, addr_type, type,
+ key->type, key->val, key->enc_size, key->ediv,
+ key->rand);
}
err = cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, 0,
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index eaac54be91b1..f05c1b71d99a 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -532,7 +532,7 @@ static void random_work(struct work_struct *work)
SMP_MAX_ENC_KEY_SIZE - smp->enc_key_size);
hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,
- HCI_SMP_STK_SLAVE, 0, 0, stk, smp->enc_key_size,
+ HCI_SMP_STK_SLAVE, 0, stk, smp->enc_key_size,
ediv, rand);
}
@@ -931,7 +931,7 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
hci_dev_lock(hdev);
authenticated = (hcon->sec_level == BT_SECURITY_HIGH);
- ltk = hci_add_ltk(hdev, &hcon->dst, hcon->dst_type, HCI_SMP_LTK, 1,
+ ltk = hci_add_ltk(hdev, &hcon->dst, hcon->dst_type, HCI_SMP_LTK,
authenticated, smp->tk, smp->enc_key_size,
rp->ediv, rp->rand);
smp->ltk = ltk;
@@ -1106,6 +1106,25 @@ done:
return err;
}
+static void smp_notify_keys(struct l2cap_conn *conn)
+{
+ struct smp_chan *smp = conn->smp_chan;
+ struct hci_conn *hcon = conn->hcon;
+ struct hci_dev *hdev = hcon->hdev;
+
+ if (smp->ltk) {
+ smp->ltk->bdaddr_type = hcon->dst_type;
+ bacpy(&smp->ltk->bdaddr, &hcon->dst);
+ mgmt_new_ltk(hdev, smp->ltk);
+ }
+
+ if (smp->slave_ltk) {
+ smp->slave_ltk->bdaddr_type = hcon->dst_type;
+ bacpy(&smp->slave_ltk->bdaddr, &hcon->dst);
+ mgmt_new_ltk(hdev, smp->slave_ltk);
+ }
+}
+
int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
{
struct smp_cmd_pairing *req, *rsp;
@@ -1151,9 +1170,8 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
authenticated = hcon->sec_level == BT_SECURITY_HIGH;
ltk = hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,
- HCI_SMP_LTK_SLAVE, 1, authenticated,
- enc.ltk, smp->enc_key_size, ediv,
- ident.rand);
+ HCI_SMP_LTK_SLAVE, authenticated, enc.ltk,
+ smp->enc_key_size, ediv, ident.rand);
smp->slave_ltk = ltk;
ident.ediv = ediv;
@@ -1197,6 +1215,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags);
cancel_delayed_work_sync(&conn->security_timer);
set_bit(SMP_FLAG_COMPLETE, &smp->smp_flags);
+ smp_notify_keys(conn);
smp_chan_destroy(conn);
}
--
1.8.5.3
^ permalink raw reply related
* [PATCH 4/6] Bluetooth: Track SMP keys in the SMP context
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
As preparation to do mgmt notification in a single place at the end of
the key distribution, store the keys that need to be notified within the
SMP context.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/smp.c | 21 +++++++++++++--------
net/bluetooth/smp.h | 3 +++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 27eebca260fa..eaac54be91b1 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -915,6 +915,7 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
struct smp_chan *smp = conn->smp_chan;
struct hci_dev *hdev = conn->hcon->hdev;
struct hci_conn *hcon = conn->hcon;
+ struct smp_ltk *ltk;
u8 authenticated;
BT_DBG("conn %p", conn);
@@ -930,9 +931,10 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
hci_dev_lock(hdev);
authenticated = (hcon->sec_level == BT_SECURITY_HIGH);
- hci_add_ltk(hdev, &hcon->dst, hcon->dst_type, HCI_SMP_LTK, 1,
- authenticated, smp->tk, smp->enc_key_size,
- rp->ediv, rp->rand);
+ ltk = hci_add_ltk(hdev, &hcon->dst, hcon->dst_type, HCI_SMP_LTK, 1,
+ authenticated, smp->tk, smp->enc_key_size,
+ rp->ediv, rp->rand);
+ smp->ltk = ltk;
if (!(smp->remote_key_dist & SMP_DIST_ID_KEY))
smp_distribute_keys(conn, 1);
hci_dev_unlock(hdev);
@@ -988,8 +990,8 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,
else
bacpy(&rpa, BDADDR_ANY);
- hci_add_irk(conn->hcon->hdev, &smp->id_addr, smp->id_addr_type,
- smp->irk, &rpa);
+ smp->remote_irk = hci_add_irk(conn->hcon->hdev, &smp->id_addr,
+ smp->id_addr_type, smp->irk, &rpa);
/* Track the connection based on the Identity Address from now on */
bacpy(&hcon->dst, &smp->id_addr);
@@ -1137,6 +1139,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
struct smp_cmd_encrypt_info enc;
struct smp_cmd_master_ident ident;
struct hci_conn *hcon = conn->hcon;
+ struct smp_ltk *ltk;
u8 authenticated;
__le16 ediv;
@@ -1147,9 +1150,11 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
smp_send_cmd(conn, SMP_CMD_ENCRYPT_INFO, sizeof(enc), &enc);
authenticated = hcon->sec_level == BT_SECURITY_HIGH;
- hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,
- HCI_SMP_LTK_SLAVE, 1, authenticated,
- enc.ltk, smp->enc_key_size, ediv, ident.rand);
+ ltk = hci_add_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,
+ HCI_SMP_LTK_SLAVE, 1, authenticated,
+ enc.ltk, smp->enc_key_size, ediv,
+ ident.rand);
+ smp->slave_ltk = ltk;
ident.ediv = ediv;
diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index 675fd3b21d2c..d8cc543f523c 100644
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -133,6 +133,9 @@ struct smp_chan {
bdaddr_t id_addr;
u8 id_addr_type;
u8 irk[16];
+ struct smp_ltk *ltk;
+ struct smp_ltk *slave_ltk;
+ struct smp_irk *remote_irk;
unsigned long smp_flags;
struct work_struct confirm;
struct work_struct random;
--
1.8.5.3
^ permalink raw reply related
* [PATCH 3/6] Bluetooth: Move New LTK store hint evaluation into mgmt_new_ltk
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
It's simpler (one less if-statement) to just evaluate the appropriate
value for store_hint in the mgmt_new_ltk function than to pass a boolean
parameter to the function. Furthermore, this simplifies moving the mgmt
event emission out from hci_add_ltk in subsequent patches.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 2 +-
net/bluetooth/hci_core.c | 8 +-------
net/bluetooth/mgmt.c | 9 +++++++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 5366dc9e25eb..8ca95e5e3765 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1211,7 +1211,7 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
void mgmt_discovering(struct hci_dev *hdev, u8 discovering);
int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent);
+void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key);
void mgmt_reenable_advertising(struct hci_dev *hdev);
void mgmt_smp_complete(struct hci_conn *conn, bool complete);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e23c718d668b..60c875267c19 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2768,7 +2768,6 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
{
struct smp_ltk *key, *old_key;
bool master = ltk_type_master(type);
- u8 persistent;
old_key = hci_find_ltk_by_addr(hdev, bdaddr, addr_type, master);
if (old_key)
@@ -2792,13 +2791,8 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
if (!new_key)
return key;
- if (addr_type == ADDR_LE_DEV_RANDOM && (bdaddr->b[5] & 0xc0) != 0xc0)
- persistent = 0;
- else
- persistent = 1;
-
if (type == HCI_SMP_LTK || type == HCI_SMP_LTK_SLAVE)
- mgmt_new_ltk(hdev, key, persistent);
+ mgmt_new_ltk(hdev, key);
return key;
}
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 747cb9bbc331..ad51da1b6dc2 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4765,13 +4765,18 @@ void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
mgmt_event(MGMT_EV_NEW_LINK_KEY, hdev, &ev, sizeof(ev), NULL);
}
-void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent)
+void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key)
{
struct mgmt_ev_new_long_term_key ev;
memset(&ev, 0, sizeof(ev));
- ev.store_hint = persistent;
+ if (key->bdaddr_type == ADDR_LE_DEV_RANDOM &&
+ (key->bdaddr.b[5] & 0xc0) != 0xc0)
+ ev.store_hint = 0x00;
+ else
+ ev.store_hint = 0x01;
+
bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type);
ev.key.type = key->authenticated;
--
1.8.5.3
^ permalink raw reply related
* [PATCH 2/6] Bluetooth: Return added key when adding LTKs and IRKs
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
The SMP code will need to postpone the mgmt event emission for the IRK
and LTKs. To avoid extra lookups at the end of the key distribution
simply return the added value from the add_ltk and add_irk functions.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 11 ++++++-----
net/bluetooth/hci_core.c | 21 +++++++++++----------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 64c4e3f0a515..5366dc9e25eb 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -787,9 +787,10 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);
struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8],
bool master);
-int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
- int new_key, u8 authenticated, u8 tk[16], u8 enc_size,
- __le16 ediv, u8 rand[8]);
+struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
+ u8 addr_type, u8 type, int new_key,
+ u8 authenticated, u8 tk[16], u8 enc_size,
+ __le16 ediv, u8 rand[8]);
struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 addr_type, bool master);
int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type);
@@ -799,8 +800,8 @@ int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
struct smp_irk *hci_find_irk_by_rpa(struct hci_dev *hdev, bdaddr_t *rpa);
struct smp_irk *hci_find_irk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 addr_type);
-int hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type,
- u8 val[16], bdaddr_t *rpa);
+struct smp_irk *hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr,
+ u8 addr_type, u8 val[16], bdaddr_t *rpa);
void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type);
void hci_smp_irks_clear(struct hci_dev *hdev);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 7e679e085506..e23c718d668b 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2761,9 +2761,10 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
return 0;
}
-int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
- int new_key, u8 authenticated, u8 tk[16], u8 enc_size, __le16
- ediv, u8 rand[8])
+struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
+ u8 addr_type, u8 type, int new_key,
+ u8 authenticated, u8 tk[16], u8 enc_size,
+ __le16 ediv, u8 rand[8])
{
struct smp_ltk *key, *old_key;
bool master = ltk_type_master(type);
@@ -2775,7 +2776,7 @@ int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
else {
key = kzalloc(sizeof(*key), GFP_KERNEL);
if (!key)
- return -ENOMEM;
+ return NULL;
list_add(&key->list, &hdev->long_term_keys);
}
@@ -2789,7 +2790,7 @@ int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
memcpy(key->rand, rand, sizeof(key->rand));
if (!new_key)
- return 0;
+ return key;
if (addr_type == ADDR_LE_DEV_RANDOM && (bdaddr->b[5] & 0xc0) != 0xc0)
persistent = 0;
@@ -2799,11 +2800,11 @@ int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
if (type == HCI_SMP_LTK || type == HCI_SMP_LTK_SLAVE)
mgmt_new_ltk(hdev, key, persistent);
- return 0;
+ return key;
}
-int hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type,
- u8 val[16], bdaddr_t *rpa)
+struct smp_irk *hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr,
+ u8 addr_type, u8 val[16], bdaddr_t *rpa)
{
struct smp_irk *irk;
@@ -2811,7 +2812,7 @@ int hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type,
if (!irk) {
irk = kzalloc(sizeof(*irk), GFP_KERNEL);
if (!irk)
- return -ENOMEM;
+ return NULL;
bacpy(&irk->bdaddr, bdaddr);
irk->addr_type = addr_type;
@@ -2822,7 +2823,7 @@ int hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type,
memcpy(irk->val, val, 16);
bacpy(&irk->rpa, rpa);
- return 0;
+ return irk;
}
int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr)
--
1.8.5.3
^ permalink raw reply related
* [PATCH 1/6] Bluetooth: Avoid using GFP_ATOMIC where not necessary
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1392814668-4830-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
The various pieces of data cached in the hci_dev structure do not need
to be allocated using GFP_ATOMIC since they are never added from
interrupt context. This patch updates these allocations to use
GFP_KERNEL instead.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/hci_core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e8f61b3fe87c..7e679e085506 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2721,7 +2721,7 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
key = old_key;
} else {
old_key_type = conn ? conn->key_type : 0xff;
- key = kzalloc(sizeof(*key), GFP_ATOMIC);
+ key = kzalloc(sizeof(*key), GFP_KERNEL);
if (!key)
return -ENOMEM;
list_add(&key->list, &hdev->link_keys);
@@ -2773,7 +2773,7 @@ int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
if (old_key)
key = old_key;
else {
- key = kzalloc(sizeof(*key), GFP_ATOMIC);
+ key = kzalloc(sizeof(*key), GFP_KERNEL);
if (!key)
return -ENOMEM;
list_add(&key->list, &hdev->long_term_keys);
@@ -2938,7 +2938,7 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
data = hci_find_remote_oob_data(hdev, bdaddr);
if (!data) {
- data = kmalloc(sizeof(*data), GFP_ATOMIC);
+ data = kmalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
@@ -2965,7 +2965,7 @@ int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
data = hci_find_remote_oob_data(hdev, bdaddr);
if (!data) {
- data = kmalloc(sizeof(*data), GFP_ATOMIC);
+ data = kmalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
--
1.8.5.3
^ permalink raw reply related
* [PATCH 0/6] Bluetooth: Add support for New IRK mgmt event
From: johan.hedberg @ 2014-02-19 12:57 UTC (permalink / raw)
To: linux-bluetooth
Hi,
This patch set adds support for the New IRK mgmt event and moves the
sending of New LTK events after that event (ensuring they all contain
the Identity Address insted of the RPA).
Johan
----------------------------------------------------------------
Johan Hedberg (6):
Bluetooth: Avoid using GFP_ATOMIC where not necessary
Bluetooth: Return added key when adding LTKs and IRKs
Bluetooth: Move New LTK store hint evaluation into mgmt_new_ltk
Bluetooth: Track SMP keys in the SMP context
Bluetooth: Move SMP LTK notification after key distribution
Bluetooth: Add support for sending New IRK event
include/net/bluetooth/hci_core.h | 13 ++++++-----
include/net/bluetooth/mgmt.h | 7 ++++++
net/bluetooth/hci_core.c | 38 +++++++++++--------------------
net/bluetooth/mgmt.c | 30 ++++++++++++++++++++-----
net/bluetooth/smp.c | 45 +++++++++++++++++++++++++++++--------
net/bluetooth/smp.h | 3 +++
6 files changed, 91 insertions(+), 45 deletions(-)
^ permalink raw reply
* Re: [RFC 10/11] android/tester: Execute hh report cbacks in main loop
From: Tyszkowski Jakub @ 2014-02-19 12:01 UTC (permalink / raw)
To: Anderson Lizardo; +Cc: BlueZ development
In-Reply-To: <CAJdJm_M4KmZu-mTTNQhGwC=wL4FC3LRO3g7iBKV34N1hik0CSg@mail.gmail.com>
Hi Anderson,
On 02/19/2014 12:50 PM, Anderson Lizardo wrote:
> Hi Jakub,
>
> On Wed, Feb 19, 2014 at 6:25 AM, Jakub Tyszkowski
> <jakub.tyszkowski@tieto.com> wrote:
>> Execute HIDHost generic get_report_cb in tester's main loop.
>> ---
>> android/android-tester.c | 25 +++++++++++++++++++++----
>> 1 file changed, 21 insertions(+), 4 deletions(-)
>>
>> diff --git a/android/android-tester.c b/android/android-tester.c
>> index 1e1d9aa..2bf897d 100644
>> --- a/android/android-tester.c
>> +++ b/android/android-tester.c
>> @@ -129,6 +129,7 @@ struct generic_cb_data {
>>
>> bthh_hid_info_t hid_info;
>> bthh_protocol_mode_t mode;
>> + uint8_t report;
>> };
>>
>> static char exec_dir[PATH_MAX + 1];
>> @@ -3311,17 +3312,33 @@ static void hidhost_protocol_mode_cb(bt_bdaddr_t *bd_addr,
>> g_idle_add(hidhost_protocol_mode, cb_data);
>> }
>>
>> -static void hidhost_get_report_cb(bt_bdaddr_t *bd_addr, bthh_status_t status,
>> - uint8_t *report, int size)
>> +static gboolean hidhost_get_report(gpointer user_data)
>> {
>> struct test_data *data = tester_get_data();
>> const struct hidhost_generic_data *test = data->test_data;
>> + struct generic_cb_data *cb_data = user_data;
>>
>> data->cb_count++;
>>
>> if (test && test->expected_hal_cb.get_report_cb)
>> - test->expected_hal_cb.get_report_cb(bd_addr, status, report,
>> - size);
>> + test->expected_hal_cb.get_report_cb(&cb_data->bdaddr,
>> + cb_data->status, &cb_data->report, cb_data->num);
>> +
>> + g_free(cb_data);
>> + return FALSE;
>> +}
>> +
>> +static void hidhost_get_report_cb(bt_bdaddr_t *bd_addr, bthh_status_t status,
>> + uint8_t *report, int size)
>> +{
>> + struct generic_cb_data *cb_data = g_new0(struct generic_cb_data, 1);
>> +
>> + cb_data->bdaddr = *bd_addr;
>> + cb_data->status = status;
>> + cb_data->report = *report;
>> + cb_data->num = size;
>
> Shouldn't cb_data->report be an array allocated with g_memdup()?
Yes it should. Sorry about that.
>
>> +
>> + g_idle_add(hidhost_get_report, cb_data);
>> }
>
> Best Regards,
>
Best Regards,
Jakub Tyszkowski
^ permalink raw reply
* Re: [RFC 07/11] android/tester: Execute hh connection state cbacks in main loop
From: Tyszkowski Jakub @ 2014-02-19 11:54 UTC (permalink / raw)
To: Anderson Lizardo; +Cc: BlueZ development
In-Reply-To: <CAJdJm_Mh-vZ2ieKJq_CWao43ticSu++JTdvDwraHODFB_U76dA@mail.gmail.com>
Hi Anderson,
On 02/19/2014 12:25 PM, Anderson Lizardo wrote:
> Hi Jakub,
>
> On Wed, Feb 19, 2014 at 6:25 AM, Jakub Tyszkowski
> <jakub.tyszkowski@tieto.com> wrote:
>> Execute generic HIDHost connection_state_cb in tester's main loop.
>> ---
>> android/android-tester.c | 23 +++++++++++++++++++----
>> 1 file changed, 19 insertions(+), 4 deletions(-)
>>
>> diff --git a/android/android-tester.c b/android/android-tester.c
>> index 0115943..664f381 100644
>> --- a/android/android-tester.c
>> +++ b/android/android-tester.c
>> @@ -3212,19 +3212,34 @@ clean:
>> close(sock_fd);
>> }
>>
>> -static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr,
>> - bthh_connection_state_t state)
>> +static gboolean hidhost_connection_state(gpointer user_data)
>> {
>> struct test_data *data = tester_get_data();
>> const struct hidhost_generic_data *test = data->test_data;
>> + struct generic_cb_data *cb_data = user_data;
>>
>> data->cb_count++;
>>
>> - if (state == BTHH_CONN_STATE_CONNECTED)
>> + if ((int) cb_data->state == BTHH_CONN_STATE_CONNECTED)
>
> You are reusing a variable of different type (bt_state_t vs.
> bthh_connection_state_t), so I believe it's why you are casting above.
>
> My suggestion (if that works) is to declare the state field in
> generic_cb_data as int, so it should work without any casting.
>
> Best Regards,
>
Yeap, we could probably use int or add more fields to this struct. But
it would probably be better to replace single generic_cb_data with per
HAL struct like bt_cb_data and hh_cb_data. It would be more elegant.
Best regards,
Jakub Tyszkowski
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox