* [PATCHv4 8/8] android: Use thread-safe helpers
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Make use of thread-safe helpers.
---
android/client/textconv.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/android/client/textconv.c b/android/client/textconv.c
index 1dc6ad0..effd1b3 100644
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -19,6 +19,8 @@
#include <stdio.h>
#include <hardware/bluetooth.h>
+#include "../pthread-local.h"
+
#include "textconv.h"
/*
@@ -227,11 +229,12 @@ const char *enum_one_string(void *v, int i)
return (i == 0) && (m[0] != 0) ? m : NULL;
}
+GLOBAL_INIT_THREAD_LOCAL_BUFFER(bdaddr);
char *bdaddr2str(const bt_bdaddr_t *bd_addr)
{
- static char buf[MAX_ADDR_STR_LEN];
+ LOCAL_INIT_THREAD_LOCAL_BUFFER(char*, bdaddr, MAX_ADDR_STR_LEN);
- return bt_bdaddr_t2str(bd_addr, buf);
+ return bt_bdaddr_t2str(bd_addr, bdaddr_tls_buffer);
}
static char *btuuid2str(const bt_uuid_t *uuid)
@@ -241,12 +244,14 @@ static char *btuuid2str(const bt_uuid_t *uuid)
return bt_uuid_t2str(uuid, buf);
}
+GLOBAL_INIT_THREAD_LOCAL_BUFFER(property);
char *btproperty2str(const bt_property_t *property)
{
- static char buf[4096];
char *p;
+ LOCAL_INIT_THREAD_LOCAL_BUFFER(char*, property, 4096);
- p = buf + sprintf(buf, "type=%s len=%d val=",
+ p = property_tls_buffer + sprintf(property_tls_buffer,
+ "type=%s len=%d val=",
bt_property_type_t2str(property->type),
property->len);
@@ -334,5 +339,5 @@ char *btproperty2str(const bt_property_t *property)
sprintf(p, "%p", property->val);
}
- return buf;
+ return property_tls_buffer;
}
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 7/8] android: Add thread-safe helpers
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Add thread safe helpers to make HAL debug printing thread-safe. The code
is inherited from Android bionic and it is used for strerror, strsignal,
etc.
---
android/pthread-local.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 android/pthread-local.h
diff --git a/android/pthread-local.h b/android/pthread-local.h
new file mode 100644
index 0000000..bc3c0b3
--- /dev/null
+++ b/android/pthread-local.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2013 Intel Corp.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <pthread.h>
+#include <stdlib.h>
+
+#define GLOBAL_INIT_THREAD_LOCAL_BUFFER(name) \
+ static pthread_key_t __tls_ ## name ## _key; \
+ static void __tls_ ## name ## _key_destroy(void *buffer) \
+ { \
+ free(buffer); \
+ } \
+ static void __attribute__((constructor)) __tls_ ## name ## _key_init() \
+ { \
+ pthread_key_create(&__tls_ ## name ## _key, \
+ __tls_ ## name ## _key_destroy); \
+ }
+
+/*
+ * Leaves "name_tls_buffer" and "name_tls_buffer_size" defined and initialized.
+ */
+#define LOCAL_INIT_THREAD_LOCAL_BUFFER(type, name, byte_count) \
+ const size_t name ## _tls_buffer_size \
+ __attribute__((unused)) = byte_count; \
+ type name ## _tls_buffer = \
+ (pthread_getspecific(__tls_ ## name ## _key)); \
+ if (name ## _tls_buffer == NULL) { \
+ name ## _tls_buffer = (calloc(1, byte_count)); \
+ pthread_setspecific(__tls_ ## name ## _key, \
+ name ## _tls_buffer); \
+ }
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 6/8] android/hal: Print adapter property in callback
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
android/hal-bluetooth.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 0908f06..1d5b04f 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -59,6 +59,8 @@ static void repack_properties(bt_property_t *send_props,
p += sizeof(*hal_prop) + hal_prop->len;
hal_prop = p;
+
+ DBG("prop[%d]: %s", i, btproperty2str(&send_props[i]));
}
}
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 5/8] android/hal: Print adapter state
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
android/hal-bluetooth.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 93490f3..0908f06 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -33,6 +33,8 @@ static void handle_adapter_state_changed(void *buf)
{
struct hal_ev_adapter_state_changed *ev = buf;
+ DBG("state: %s", bt_state_t2str(ev->state));
+
if (bt_hal_cbacks->adapter_state_changed_cb)
bt_hal_cbacks->adapter_state_changed_cb(ev->state);
}
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 4/8] android/hal: Add extra logs
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Add extra log prints for printing properties and bluetooth addresses.
---
android/hal-bluetooth.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 89535ed..93490f3 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -346,7 +346,7 @@ static int set_adapter_property(const bt_property_t *property)
static int get_remote_device_properties(bt_bdaddr_t *remote_addr)
{
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(remote_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -357,7 +357,8 @@ static int get_remote_device_properties(bt_bdaddr_t *remote_addr)
static int get_remote_device_property(bt_bdaddr_t *remote_addr,
bt_property_type_t type)
{
- DBG("");
+ DBG("bdaddr: %s prop: %s", bdaddr2str(remote_addr),
+ bt_property_type_t2str(type));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -368,7 +369,8 @@ static int get_remote_device_property(bt_bdaddr_t *remote_addr,
static int set_remote_device_property(bt_bdaddr_t *remote_addr,
const bt_property_t *property)
{
- DBG("");
+ DBG("bdaddr: %s prop: %s", bdaddr2str(remote_addr),
+ btproperty2str(property));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -378,7 +380,7 @@ static int set_remote_device_property(bt_bdaddr_t *remote_addr,
static int get_remote_service_record(bt_bdaddr_t *remote_addr, bt_uuid_t *uuid)
{
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(remote_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -388,7 +390,7 @@ static int get_remote_service_record(bt_bdaddr_t *remote_addr, bt_uuid_t *uuid)
static int get_remote_services(bt_bdaddr_t *remote_addr)
{
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(remote_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -424,7 +426,7 @@ static int create_bond(const bt_bdaddr_t *bd_addr)
{
struct hal_cmd_create_bond cmd;
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(bd_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -439,7 +441,7 @@ static int cancel_bond(const bt_bdaddr_t *bd_addr)
{
struct hal_cmd_cancel_bond cmd;
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(bd_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -454,7 +456,7 @@ static int remove_bond(const bt_bdaddr_t *bd_addr)
{
struct hal_cmd_remove_bond cmd;
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(bd_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -470,7 +472,7 @@ static int pin_reply(const bt_bdaddr_t *bd_addr, uint8_t accept,
{
struct hal_cmd_pin_reply cmd;
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(bd_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
@@ -489,7 +491,7 @@ static int ssp_reply(const bt_bdaddr_t *bd_addr, bt_ssp_variant_t variant,
{
struct hal_cmd_ssp_reply cmd;
- DBG("");
+ DBG("bdaddr: %s", bdaddr2str(bd_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 3/8] android/hal: Print full property in debug
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Instead of printing property type print type and value. Use exported
function from hal test tool.
---
android/hal-bluetooth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 2237063..89535ed 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -321,7 +321,7 @@ static int set_adapter_property(const bt_property_t *property)
char buf[sizeof(struct hal_cmd_set_adapter_prop) + property->len];
struct hal_cmd_set_adapter_prop *cmd = (void *) buf;
- DBG("prop: %s", bt_property_type_t2str(property->type));
+ DBG("prop: %s", btproperty2str(property));
if (!interface_ready())
return BT_STATUS_NOT_READY;
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 2/8] android/haltest: Use pointer as parameter for debug
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Pass structure as pointer. This makes it consistent with the rest of
the code and helps to reuse this function in other parts.
---
android/client/if-bt.c | 2 +-
android/client/textconv.c | 36 ++++++++++++++++++------------------
android/client/textconv.h | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index e9edec5..cbb828b 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -74,7 +74,7 @@ static void dump_properties(int num_properties, bt_property_t *properties)
bt_property_t prop;
memcpy(&prop, properties + i, sizeof(prop));
- haltest_info("prop: %s\n", btproperty2str(prop));
+ haltest_info("prop: %s\n", btproperty2str(&prop));
}
}
diff --git a/android/client/textconv.c b/android/client/textconv.c
index 8f27948..1dc6ad0 100644
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -241,52 +241,52 @@ static char *btuuid2str(const bt_uuid_t *uuid)
return bt_uuid_t2str(uuid, buf);
}
-char *btproperty2str(bt_property_t property)
+char *btproperty2str(const bt_property_t *property)
{
static char buf[4096];
char *p;
p = buf + sprintf(buf, "type=%s len=%d val=",
- bt_property_type_t2str(property.type),
- property.len);
+ bt_property_type_t2str(property->type),
+ property->len);
- switch (property.type) {
+ switch (property->type) {
case BT_PROPERTY_BDNAME:
case BT_PROPERTY_REMOTE_FRIENDLY_NAME:
- sprintf(p, "%*s", property.len,
- ((bt_bdname_t *) property.val)->name);
+ sprintf(p, "%*s", property->len,
+ ((bt_bdname_t *) property->val)->name);
break;
case BT_PROPERTY_BDADDR:
- sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property.val));
+ sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property->val));
break;
case BT_PROPERTY_CLASS_OF_DEVICE:
- sprintf(p, "%06x", *((int *) property.val));
+ sprintf(p, "%06x", *((int *) property->val));
break;
case BT_PROPERTY_TYPE_OF_DEVICE:
sprintf(p, "%s", bt_device_type_t2str(
- *((bt_device_type_t *) property.val)));
+ *((bt_device_type_t *) property->val)));
break;
case BT_PROPERTY_REMOTE_RSSI:
- sprintf(p, "%d", *((char *) property.val));
+ sprintf(p, "%d", *((char *) property->val));
break;
case BT_PROPERTY_ADAPTER_SCAN_MODE:
sprintf(p, "%s",
- bt_scan_mode_t2str(*((bt_scan_mode_t *) property.val)));
+ bt_scan_mode_t2str(*((bt_scan_mode_t *) property->val)));
break;
case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
- sprintf(p, "%d", *((int *) property.val));
+ sprintf(p, "%d", *((int *) property->val));
break;
case BT_PROPERTY_ADAPTER_BONDED_DEVICES:
{
- int count = property.len / sizeof(bt_bdaddr_t);
- char *ptr = property.val;
+ int count = property->len / sizeof(bt_bdaddr_t);
+ char *ptr = property->val;
strcat(p, "{");
@@ -304,8 +304,8 @@ char *btproperty2str(bt_property_t property)
case BT_PROPERTY_UUIDS:
{
- int count = property.len / sizeof(bt_uuid_t);
- char *ptr = property.val;
+ int count = property->len / sizeof(bt_uuid_t);
+ char *ptr = property->val;
strcat(p, "{");
@@ -323,7 +323,7 @@ char *btproperty2str(bt_property_t property)
case BT_PROPERTY_SERVICE_RECORD:
{
- bt_service_record_t *rec = property.val;
+ bt_service_record_t *rec = property->val;
sprintf(p, "{%s, %d, %s}", btuuid2str(&rec->uuid),
rec->channel, rec->name);
@@ -331,7 +331,7 @@ char *btproperty2str(bt_property_t property)
break;
default:
- sprintf(p, "%p", property.val);
+ sprintf(p, "%p", property->val);
}
return buf;
diff --git a/android/client/textconv.h b/android/client/textconv.h
index 89b29c6..1c848ef 100644
--- a/android/client/textconv.h
+++ b/android/client/textconv.h
@@ -107,7 +107,7 @@ void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr);
char *bt_uuid_t2str(const bt_uuid_t *uuid, char *buf);
void str2bt_uuid_t(const char *str, bt_uuid_t *uuid);
-char *btproperty2str(bt_property_t property);
+char *btproperty2str(const bt_property_t *property);
char *bdaddr2str(const bt_bdaddr_t *bd_addr);
DECINTMAP(bt_status_t);
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 1/8] android/haltest: Export print property
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383135406-23658-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Export property printing debug function.
---
android/client/if-bt.c | 110 ---------------------------------------------
android/client/textconv.c | 110 +++++++++++++++++++++++++++++++++++++++++++++
android/client/textconv.h | 3 ++
3 files changed, 113 insertions(+), 110 deletions(-)
diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index a20a7c6..e9edec5 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -29,20 +29,6 @@ const bt_interface_t *if_bluetooth;
} \
} while (0)
-static char *bdaddr2str(const bt_bdaddr_t *bd_addr)
-{
- static char buf[MAX_ADDR_STR_LEN];
-
- return bt_bdaddr_t2str(bd_addr, buf);
-}
-
-static char *btuuid2str(const bt_uuid_t *uuid)
-{
- static char buf[MAX_UUID_STR_LEN];
-
- return bt_uuid_t2str(uuid, buf);
-}
-
static bt_scan_mode_t str2btscanmode(const char *str)
{
bt_scan_mode_t v = str2bt_scan_mode_t(str);
@@ -76,102 +62,6 @@ static bt_property_type_t str2btpropertytype(const char *str)
return (bt_property_type_t) atoi(str);
}
-static char *btproperty2str(bt_property_t property)
-{
- static char buf[4096];
- char *p;
-
- p = buf + sprintf(buf, "type=%s len=%d val=",
- bt_property_type_t2str(property.type),
- property.len);
-
- switch (property.type) {
- case BT_PROPERTY_BDNAME:
- case BT_PROPERTY_REMOTE_FRIENDLY_NAME:
- sprintf(p, "%*s", property.len,
- ((bt_bdname_t *) property.val)->name);
- break;
-
- case BT_PROPERTY_BDADDR:
- sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property.val));
- break;
-
- case BT_PROPERTY_CLASS_OF_DEVICE:
- sprintf(p, "%06x", *((int *) property.val));
- break;
-
- case BT_PROPERTY_TYPE_OF_DEVICE:
- sprintf(p, "%s", bt_device_type_t2str(
- *((bt_device_type_t *) property.val)));
- break;
-
- case BT_PROPERTY_REMOTE_RSSI:
- sprintf(p, "%d", *((char *) property.val));
- break;
-
- case BT_PROPERTY_ADAPTER_SCAN_MODE:
- sprintf(p, "%s",
- bt_scan_mode_t2str(*((bt_scan_mode_t *) property.val)));
- break;
-
- case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
- sprintf(p, "%d", *((int *) property.val));
- break;
-
- case BT_PROPERTY_ADAPTER_BONDED_DEVICES:
- {
- int count = property.len / sizeof(bt_bdaddr_t);
- char *ptr = property.val;
-
- strcat(p, "{");
-
- while (count--) {
- strcat(p, bdaddr2str((bt_bdaddr_t *) ptr));
- if (count)
- strcat(p, ", ");
- ptr += sizeof(bt_bdaddr_t);
- }
-
- strcat(p, "}");
-
- }
- break;
-
- case BT_PROPERTY_UUIDS:
- {
- int count = property.len / sizeof(bt_uuid_t);
- char *ptr = property.val;
-
- strcat(p, "{");
-
- while (count--) {
- strcat(p, btuuid2str((bt_uuid_t *) ptr));
- if (count)
- strcat(p, ", ");
- ptr += sizeof(bt_uuid_t);
- }
-
- strcat(p, "}");
-
- }
- break;
-
- case BT_PROPERTY_SERVICE_RECORD:
- {
- bt_service_record_t *rec = property.val;
-
- sprintf(p, "{%s, %d, %s}", btuuid2str(&rec->uuid),
- rec->channel, rec->name);
- }
- break;
-
- default:
- sprintf(p, "%p", property.val);
- }
-
- return buf;
-}
-
static void dump_properties(int num_properties, bt_property_t *properties)
{
int i;
diff --git a/android/client/textconv.c b/android/client/textconv.c
index 32b1cab..8f27948 100644
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -226,3 +226,113 @@ const char *enum_one_string(void *v, int i)
return (i == 0) && (m[0] != 0) ? m : NULL;
}
+
+char *bdaddr2str(const bt_bdaddr_t *bd_addr)
+{
+ static char buf[MAX_ADDR_STR_LEN];
+
+ return bt_bdaddr_t2str(bd_addr, buf);
+}
+
+static char *btuuid2str(const bt_uuid_t *uuid)
+{
+ static char buf[MAX_UUID_STR_LEN];
+
+ return bt_uuid_t2str(uuid, buf);
+}
+
+char *btproperty2str(bt_property_t property)
+{
+ static char buf[4096];
+ char *p;
+
+ p = buf + sprintf(buf, "type=%s len=%d val=",
+ bt_property_type_t2str(property.type),
+ property.len);
+
+ switch (property.type) {
+ case BT_PROPERTY_BDNAME:
+ case BT_PROPERTY_REMOTE_FRIENDLY_NAME:
+ sprintf(p, "%*s", property.len,
+ ((bt_bdname_t *) property.val)->name);
+ break;
+
+ case BT_PROPERTY_BDADDR:
+ sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property.val));
+ break;
+
+ case BT_PROPERTY_CLASS_OF_DEVICE:
+ sprintf(p, "%06x", *((int *) property.val));
+ break;
+
+ case BT_PROPERTY_TYPE_OF_DEVICE:
+ sprintf(p, "%s", bt_device_type_t2str(
+ *((bt_device_type_t *) property.val)));
+ break;
+
+ case BT_PROPERTY_REMOTE_RSSI:
+ sprintf(p, "%d", *((char *) property.val));
+ break;
+
+ case BT_PROPERTY_ADAPTER_SCAN_MODE:
+ sprintf(p, "%s",
+ bt_scan_mode_t2str(*((bt_scan_mode_t *) property.val)));
+ break;
+
+ case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
+ sprintf(p, "%d", *((int *) property.val));
+ break;
+
+ case BT_PROPERTY_ADAPTER_BONDED_DEVICES:
+ {
+ int count = property.len / sizeof(bt_bdaddr_t);
+ char *ptr = property.val;
+
+ strcat(p, "{");
+
+ while (count--) {
+ strcat(p, bdaddr2str((bt_bdaddr_t *) ptr));
+ if (count)
+ strcat(p, ", ");
+ ptr += sizeof(bt_bdaddr_t);
+ }
+
+ strcat(p, "}");
+
+ }
+ break;
+
+ case BT_PROPERTY_UUIDS:
+ {
+ int count = property.len / sizeof(bt_uuid_t);
+ char *ptr = property.val;
+
+ strcat(p, "{");
+
+ while (count--) {
+ strcat(p, btuuid2str((bt_uuid_t *) ptr));
+ if (count)
+ strcat(p, ", ");
+ ptr += sizeof(bt_uuid_t);
+ }
+
+ strcat(p, "}");
+
+ }
+ break;
+
+ case BT_PROPERTY_SERVICE_RECORD:
+ {
+ bt_service_record_t *rec = property.val;
+
+ sprintf(p, "{%s, %d, %s}", btuuid2str(&rec->uuid),
+ rec->channel, rec->name);
+ }
+ break;
+
+ default:
+ sprintf(p, "%p", property.val);
+ }
+
+ return buf;
+}
diff --git a/android/client/textconv.h b/android/client/textconv.h
index 085b141..89b29c6 100644
--- a/android/client/textconv.h
+++ b/android/client/textconv.h
@@ -107,6 +107,9 @@ void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr);
char *bt_uuid_t2str(const bt_uuid_t *uuid, char *buf);
void str2bt_uuid_t(const char *str, bt_uuid_t *uuid);
+char *btproperty2str(bt_property_t property);
+char *bdaddr2str(const bt_bdaddr_t *bd_addr);
+
DECINTMAP(bt_status_t);
DECINTMAP(bt_state_t);
DECINTMAP(bt_device_type_t);
--
1.7.10.4
^ permalink raw reply related
* [PATCHv4 0/8] Improve logging for Android
From: Andrei Emeltchenko @ 2013-10-30 12:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383051459-29495-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Logging on Android is really important since we do not have specification
how and in which order hal functions are called, sometimes the only way is
to examine logs or read Java Bluetooth code.
Changes:
* v4: Rebased against latest upstream
* v3: Merged first two patches.
* v2: Added thread-safe helpers for printing properties, bdaddr, etc
after comments that simple printing is not thread-safe. The idea is to
use TLS (thread local storage) like bionic is doing for strerror for
example. More info can be found on manpage for pthread_key_create.
This patch series uses debug functions defined already for haltest and
allows to print very helpful logs on Android target like shown below:
...
hal-bluetooth.c:set_adapter_property() prop: type=BT_PROPERTY_ADAPTER_SCAN_MODE len=4 val=BT_SCAN_MODE_NONE
...
Andrei Emeltchenko (8):
android/haltest: Export print property
android/haltest: Use pointer as parameter for debug
android/hal: Print full property in debug
android/hal: Add extra logs
android/hal: Print adapter state
android/hal: Print adapter property in callback
android: Add thread-safe helpers
android: Use thread-safe helpers
android/client/if-bt.c | 112 +------------------------------------------
android/client/textconv.c | 115 +++++++++++++++++++++++++++++++++++++++++++++
android/client/textconv.h | 3 ++
android/hal-bluetooth.c | 28 ++++++-----
android/pthread-local.h | 58 +++++++++++++++++++++++
5 files changed, 194 insertions(+), 122 deletions(-)
create mode 100644 android/pthread-local.h
--
1.7.10.4
^ permalink raw reply
* Re: [RFC v2 4/7] Bluetooth: Enable 6LoWPAN support for BT LE devices
From: Marcel Holtmann @ 2013-10-30 12:11 UTC (permalink / raw)
To: Jukka Rissanen; +Cc: linux-bluetooth@vger.kernel.org development
In-Reply-To: <1383123661-15087-5-git-send-email-jukka.rissanen@linux.intel.com>
Hi Jukka,
> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
> ---
> net/bluetooth/6lowpan.c | 1128 ++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 1127 insertions(+), 1 deletion(-)
>
> diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
> index aff478b..1cba7fd 100644
> --- a/net/bluetooth/6lowpan.c
> +++ b/net/bluetooth/6lowpan.c
> @@ -11,6 +11,20 @@
> GNU General Public License for more details.
> */
>
> +/*
> + * The compression, uncompression and IPv6 packet fragmentation code
> + * is from net/ieee802154/6lowpan.c with these copyrights
> + *
> + * Copyright 2011, Siemens AG
> + * written by Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
> + *
> + * Based on patches from Jon Smirl <jonsmirl@gmail.com>
> + * Copyright (c) 2011 Jon Smirl <jonsmirl@gmail.com>
> + *
> + * Jon's code is based on 6lowpan implementation for Contiki which is:
> + * Copyright (c) 2008, Swedish Institute of Computer Science.
> + */
> +
I really think this should consolidated into either net/core/6lowpan.c or net/6lowpan/6lowpan.c.
Regards
Marcel
^ permalink raw reply
* Re: [RFC v2 7/7] Bluetooth: Manually enable or disable 6LoWPAN between devices
From: Marcel Holtmann @ 2013-10-30 12:10 UTC (permalink / raw)
To: Jukka Rissanen; +Cc: linux-bluetooth@vger.kernel.org development
In-Reply-To: <1383123661-15087-8-git-send-email-jukka.rissanen@linux.intel.com>
Hi Jukka,
> This is a temporary patch where user can manually enable or
> disable BT 6LoWPAN functionality between devices.
> Eventually the connection is established automatically if
> the devices are advertising suitable capability and this patch
> can be removed.
>
> If you have two devices with these BT addresses
> device1 00:11:22:33:44:55
> device2 66:77:88:99:00:11
>
> First add the desired devices manually into kernel
>
> root@dev1# echo 66:77:88:99:00:11 > /sys/kernel/debug/bluetooth/hci0/6lowpan
> root@dev2# echo 00:11:22:33:44:55 > /sys/kernel/debug/bluetooth/hci0/6lowpan
>
> then connect the devices
>
> root@dev1# hciconfig hci0 leadv
> root@dev2# hcitool lecc 00:11:22:33:44:55
>
> if the connection is established, then you can send IPv6 packets
> between these two systems using the link local addresses
>
> root@dev1# ping6 fe80::6477:88ff:fe99:0011
> root@dev2# ping6 fe80::211:22ff:fe33:4455
>
> By default 6LoWPAN connection is not established between devices,
> so you need to add the MAC addresses manually into the
> /sys/kernel/debug/bluetooth/hci0/6lowpan file.
> If you want to prevent further connections you can remove
> MAC address from the debugfs file like this
> echo "00:11:22:33:44:55 d" > /sys/kernel/debug/bluetooth/hci0/6lowpan
> Rebooting or unloading the bluetooth kernel module will also clear the
> settings from the kernel.
>
> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
> ---
> net/bluetooth/6lowpan.c | 158 +++++++++++++++++++++++++++++++++++++++++++++
> net/bluetooth/6lowpan.h | 2 +
> net/bluetooth/hci_core.c | 4 ++
> net/bluetooth/l2cap_core.c | 12 ++--
> 4 files changed, 169 insertions(+), 7 deletions(-)
>
> diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
> index 4ec3813..55f455a 100644
> --- a/net/bluetooth/6lowpan.c
> +++ b/net/bluetooth/6lowpan.c
> @@ -26,6 +26,7 @@
> */
>
> #include <linux/version.h>
> +#include <linux/debugfs.h>
> #include <linux/bitops.h>
> #include <linux/if_arp.h>
> #include <linux/netdevice.h>
> @@ -1553,6 +1554,163 @@ static struct notifier_block bt_6lowpan_dev_notifier = {
> .notifier_call = device_event,
> };
>
> +static LIST_HEAD(user_enabled);
> +DEFINE_RWLOCK(user_enabled_list_lock);
> +
> +struct lowpan_enabled {
> + __u8 dev_name[HCI_MAX_NAME_LENGTH];
> + bdaddr_t addr;
> + struct list_head list;
> +};
while I would not keep doing it like this and favor a simple switch like HCI_6LOWPAN_ENABLED in hdev->dev_flags, you however need to start also tracking the address type.
Personally I think we need to just make up a UUID-128 and just add it to AD data once HCI_6LOWPAN has been enabled. We are getting close to the background scanning patches. And then we can just have code that auto-connects devices with that specific UUID-128 if 6loWPAN is enabled. That will avoid all this list storage and complex debugfs. In the end it is just 6loWPAN on/off per hdev.
What we however do have to address is the case when one LE master is connected to two LE slaves. We should not have two 6loWPAN network devices. It should be only one since they form one network.
So maybe the creating of the net_device should be bound to debugfs/hci0/6lowpan switch for on/off. Just thinking out loud here.
> +
> +bool bt_6lowpan_is_enabled(struct hci_dev *hdev, bdaddr_t *dst)
> +{
> + struct lowpan_enabled *entry, *tmp;
> + bool found = false;
> +
> + write_lock(&user_enabled_list_lock);
> + list_for_each_entry_safe(entry, tmp, &user_enabled, list) {
> + if (!strncmp(entry->dev_name, hdev->dev_name,
> + HCI_MAX_NAME_LENGTH) &&
> + !bacmp(dst, &entry->addr)) {
> + found = true;
> + break;
> + }
> + }
> + write_unlock(&user_enabled_list_lock);
> +
> + /* Check also the device list just in case we removed the
> + * device from debugfs before disconnecting.
> + */
> + if (!found) {
> + struct lowpan_dev *entry, *tmp;
> + struct lowpan_info *info;
> +
> + write_lock(&net_dev_list_lock);
> + list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices,
> + list) {
> + info = lowpan_info(entry->dev);
> + if (info->conn->hcon->hdev == hdev &&
> + !bacmp(&info->addr, dst)) {
> + found = true;
> + break;
> + }
> + }
> + write_unlock(&net_dev_list_lock);
> + }
> +
> + return found;
> +}
> +
> +static int debugfs_show(struct seq_file *f, void *p)
> +{
> + struct lowpan_enabled *entry, *tmp;
> +
> + write_lock(&user_enabled_list_lock);
> + list_for_each_entry_safe(entry, tmp, &user_enabled, list)
> + seq_printf(f, "%pMR\n", &entry->addr);
> +
> + write_unlock(&user_enabled_list_lock);
> +
> + return 0;
> +}
> +
> +static int debugfs_open(struct inode *inode, struct file *file)
> +{
> + return single_open(file, debugfs_show, inode->i_private);
> +}
> +
> +static ssize_t writer(struct file *fp, const char __user *user_buffer,
> + size_t count, loff_t *position)
> +{
> +#define MAC_STR_LEN 17
> + char mac_buf[MAC_STR_LEN + 1];
> + ssize_t ret;
> + bool delete_mode = false;
> + struct lowpan_enabled *entry = NULL, *tmp;
> + bdaddr_t bdaddr;
> +
> + if(count > (MAC_STR_LEN + 1))
> + delete_mode = true;
> + else if (count < MAC_STR_LEN)
> + return count;
> +
> + BT_DBG("count %zd mode %d", count, delete_mode);
> +
> + memset(mac_buf, 0, MAC_STR_LEN + 1);
> + ret = simple_write_to_buffer(mac_buf, MAC_STR_LEN, position,
> + user_buffer, count);
> + if (ret <= 0)
> + return ret;
> +
> + if (sscanf(mac_buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> + &bdaddr.b[5], &bdaddr.b[4],
> + &bdaddr.b[3], &bdaddr.b[2],
> + &bdaddr.b[1], &bdaddr.b[0]) != 6)
> + return -EINVAL;
> +
> + BT_DBG("user %pMR", &bdaddr);
> +
> + write_lock(&user_enabled_list_lock);
> + list_for_each_entry_safe(entry, tmp, &user_enabled, list) {
> + if (!bacmp(&entry->addr, &bdaddr)) {
> + struct hci_dev *hdev = fp->f_inode->i_private;
> +
> + if (!strncmp(entry->dev_name, hdev->dev_name,
> + HCI_MAX_NAME_LENGTH) && delete_mode) {
> + break;
> + } else {
> + ret = -EEXIST;
> + break;
> + }
> + }
> + }
> + write_unlock(&user_enabled_list_lock);
> +
> + if (ret < 0)
> + return ret;
> +
> + if (delete_mode) {
> + write_lock(&user_enabled_list_lock);
> + list_del(&entry->list);
> + kfree(entry);
> + write_unlock(&user_enabled_list_lock);
> + } else {
> + struct hci_dev *hdev = fp->f_inode->i_private;
> +
> + entry = kzalloc(sizeof(*entry), GFP_KERNEL);
> + if (!entry)
> + return -ENOMEM;
> +
> + strncpy(entry->dev_name, hdev->dev_name, HCI_MAX_NAME_LENGTH);
> + entry->addr = bdaddr;
> +
> + write_lock(&user_enabled_list_lock);
> + INIT_LIST_HEAD(&entry->list);
> + list_add(&entry->list, &user_enabled);
> + write_unlock(&user_enabled_list_lock);
> + }
> +
> + return ret;
> +}
> +
> +static const struct file_operations ble_6lowpan_debugfs_fops = {
> + .open = debugfs_open,
> + .read = seq_read,
> + .write = writer,
> + .llseek = seq_lseek,
> + .release = single_release,
> +};
> +
> +static struct dentry *bt_6lowpan_debugfs;
> +
> +void bt_6lowpan_add_debugfs(struct hci_dev *hdev)
> +{
> + if (hdev->debugfs)
Please check if the calling place not already verified that hdev->debugfs is valid.
> + bt_6lowpan_debugfs = debugfs_create_file("6lowpan", 0644,
> + hdev->debugfs, hdev, &ble_6lowpan_debugfs_fops);
Also no point in bothering to store its return value. We use recursive cleanup. Nobody cares about the value.
> +}
> +
> int bt_6lowpan_init(void)
> {
> return register_netdevice_notifier(&bt_6lowpan_dev_notifier);
> diff --git a/net/bluetooth/6lowpan.h b/net/bluetooth/6lowpan.h
> index 680eac8..549fc51 100644
> --- a/net/bluetooth/6lowpan.h
> +++ b/net/bluetooth/6lowpan.h
> @@ -22,5 +22,7 @@ int bt_6lowpan_add_conn(struct l2cap_conn *conn);
> int bt_6lowpan_del_conn(struct l2cap_conn *conn);
> int bt_6lowpan_init(void);
> void bt_6lowpan_cleanup(void);
> +bool bt_6lowpan_is_enabled(struct hci_dev *hdev, bdaddr_t *dst);
> +void bt_6lowpan_add_debugfs(struct hci_dev *hdev);
>
> #endif /* __6LOWPAN_H */
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 6ccc4eb..444b4bc 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -34,6 +34,8 @@
> #include <net/bluetooth/bluetooth.h>
> #include <net/bluetooth/hci_core.h>
>
> +#include "6lowpan.h"
> +
> static void hci_rx_work(struct work_struct *work);
> static void hci_cmd_work(struct work_struct *work);
> static void hci_tx_work(struct work_struct *work);
> @@ -1406,6 +1408,8 @@ static int __hci_init(struct hci_dev *hdev)
> hdev, &conn_max_interval_fops);
> }
>
> + bt_6lowpan_add_debugfs(hdev);
> +
Might only want to add 6lowpan debugfs when we actually support LE.
> return 0;
> }
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index c47215f..d02241e 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -6512,11 +6512,6 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
> return exact ? lm1 : lm2;
> }
>
> -static bool is_bt_6lowpan(void)
> -{
> - return false;
> -}
> -
> void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
> {
> struct l2cap_conn *conn;
> @@ -6528,7 +6523,9 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
> if (conn) {
> l2cap_conn_ready(conn);
>
> - if (hcon->type == LE_LINK && is_bt_6lowpan())
> + if (hcon->type == LE_LINK &&
> + bt_6lowpan_is_enabled(hcon->hdev,
> + &hcon->dst))
> bt_6lowpan_add_conn(conn);
> }
> } else {
> @@ -6551,7 +6548,8 @@ void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
> {
> BT_DBG("hcon %p reason %d", hcon, reason);
>
> - if (hcon->type == LE_LINK && is_bt_6lowpan())
> + if (hcon->type == LE_LINK && bt_6lowpan_is_enabled(hcon->hdev,
> + &hcon->dst))
> bt_6lowpan_del_conn(hcon->l2cap_data);
>
> l2cap_conn_del(hcon, bt_to_errno(reason));
Regards
Marcel
^ permalink raw reply
* Re: [RFC v2 3/7] Bluetooth: Initial skeleton code for BT 6LoWPAN
From: Marcel Holtmann @ 2013-10-30 12:02 UTC (permalink / raw)
To: Jukka Rissanen; +Cc: linux-bluetooth@vger.kernel.org development
In-Reply-To: <1383123661-15087-4-git-send-email-jukka.rissanen@linux.intel.com>
Hi Jukka,
> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
> ---
> include/net/bluetooth/l2cap.h | 1 +
> net/bluetooth/6lowpan.c | 401 ++++++++++++++++++++++++++++++++++++++++++
> net/bluetooth/6lowpan.h | 26 +++
> net/bluetooth/Makefile | 2 +-
> net/bluetooth/l2cap_core.c | 22 ++-
> 5 files changed, 450 insertions(+), 2 deletions(-)
> create mode 100644 net/bluetooth/6lowpan.c
> create mode 100644 net/bluetooth/6lowpan.h
>
> diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> index 5132990..c28ac0d 100644
> --- a/include/net/bluetooth/l2cap.h
> +++ b/include/net/bluetooth/l2cap.h
> @@ -133,6 +133,7 @@ struct l2cap_conninfo {
> #define L2CAP_FC_L2CAP 0x02
> #define L2CAP_FC_CONNLESS 0x04
> #define L2CAP_FC_A2MP 0x08
> +#define L2CAP_FC_6LOWPAN 0x3e
>
> /* L2CAP Control Field bit masks */
> #define L2CAP_CTRL_SAR 0xC000
> diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
> new file mode 100644
> index 0000000..aff478b
> --- /dev/null
> +++ b/net/bluetooth/6lowpan.c
> @@ -0,0 +1,401 @@
> +/*
> + Copyright (c) 2013 Intel Corp.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License version 2 and
> + only version 2 as published by the Free Software Foundation.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +*/
> +
> +#include <linux/version.h>
> +#include <linux/bitops.h>
> +#include <linux/if_arp.h>
> +#include <linux/netdevice.h>
> +#include <linux/etherdevice.h>
> +
> +#include <net/ipv6.h>
> +#include <net/ip6_route.h>
> +#include <net/addrconf.h>
> +
> +#include <net/af_ieee802154.h>
> +
> +#include <net/bluetooth/bluetooth.h>
> +#include <net/bluetooth/hci_core.h>
> +#include <net/bluetooth/l2cap.h>
> +
> +#include "../ieee802154/6lowpan.h" /* for the compression defines */
this is fine for now, but please check on netdev (aka send patches) to see if we should have something like net/core/6lowpan.[ch]. Or if they prefer net/6lowpan/6lowpan.[ch].
> +
> +#define IFACE_NAME_TEMPLATE "bt%d"
> +
> +/*
> + * The devices list contains those devices that we are acting
> + * as a proxy. The BT 6LoWPAN device is a virtual device that
> + * connects to the Bluetooth LE device. The real connection to
> + * BT device is done via l2cap layer. There exists one
> + * virtual device / one BT 6LoWPAN device. The list contains
> + * struct lowpan_dev elements.
> + */
> +static LIST_HEAD(bt_6lowpan_devices);
> +DEFINE_RWLOCK(net_dev_list_lock);
You need to find a better name for the lock. And you can also make that one static I assume.
> +
> +struct lowpan_dev {
> + struct net_device *dev;
> + struct delayed_work delete_timer;
> + struct list_head list;
> +};
> +
> +struct lowpan_info {
> + struct net_device *net;
> + struct l2cap_conn *conn;
> + uint16_t ifindex;
> + bdaddr_t myaddr;
> +
> + /* peer addresses in various formats */
> + bdaddr_t addr;
> + unsigned char ieee802154_addr[IEEE802154_ADDR_LEN];
> + struct in6_addr peer;
> +};
> +
> +struct lowpan_fragment {
> + struct sk_buff *skb; /* skb to be assembled */
> + u16 length; /* length to be assemled */
> + u32 bytes_rcv; /* bytes received */
> + u16 tag; /* current fragment tag */
> + struct timer_list timer; /* assembling timer */
> + struct list_head list; /* fragments list */
> +};
> +
> +#define DELETE_TIMEOUT msecs_to_jiffies(1)
Maybe a comment why this is 1 msecs would be good here. It is a rather tiny timeout.
> +
> +/* TTL uncompression values */
> +static const u8 lowpan_ttl_values[] = {0, 1, 64, 255};
Personally I would have { 0, .., 255 }; here. So extra spaces between { and }.
> +
> +static inline struct
> +lowpan_info *lowpan_info(const struct net_device *dev)
Linebreak between struct and lowpan_info looks weird to me.
> +{
> + return netdev_priv(dev);
> +}
Not sure what the standard in the network subsystem here, but maybe a #define would be better.
> +
> +/* print data in line */
> +static inline void raw_dump_inline(const char *caller, char *msg,
> + unsigned char *buf, int len)
> +{
> +#ifdef DEBUG
> + if (msg)
> + pr_debug("%s():%s: ", caller, msg);
> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE,
> + 16, 1, buf, len, false);
> +#endif /* DEBUG */
> +}
> +
> +/*
> + * print data in a table format:
> + *
> + * addr: xx xx xx xx xx xx
> + * addr: xx xx xx xx xx xx
> + * ...
> + */
> +static inline void raw_dump_table(const char *caller, char *msg,
> + unsigned char *buf, int len)
> +{
> +#ifdef DEBUG
> + if (msg)
> + pr_debug("%s():%s:\n", caller, msg);
> + print_hex_dump(KERN_DEBUG, "\t", DUMP_PREFIX_OFFSET,
> + 16, 1, buf, len, false);
> +#endif /* DEBUG */
> +}
> +
> +static int recv_pkt(struct sk_buff *skb, struct net_device *dev)
> +{
> + kfree_skb(skb);
> + return NET_RX_DROP;
> +}
> +
> +/* Packet from BT LE device */
> +int bt_6lowpan_recv(struct l2cap_conn *conn, struct sk_buff *skb)
> +{
> + struct lowpan_dev *entry, *tmp;
> + struct net_device *dev = NULL;
> + int status = -ENOENT;
> +
> + write_lock(&net_dev_list_lock);
> +
> + list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
> + if (lowpan_info(entry->dev)->conn == conn) {
> + dev = lowpan_info(entry->dev)->net;
> + break;
> + }
> + }
> +
> + write_unlock(&net_dev_list_lock);
> +
> + if (dev) {
> + status = recv_pkt(skb, dev);
> + BT_DBG("recv pkt %d", status);
> + }
> +
> + return status;
> +}
> +
> +static void do_send(struct l2cap_conn *conn, struct sk_buff *skb)
> +{
> + BT_DBG("conn %p, skb %p len %d priority %u", conn, skb, skb->len,
> + skb->priority);
> +
> + return;
> +}
> +
> +static int conn_send(struct l2cap_conn *conn,
> + void *msg, size_t len, u32 priority,
> + struct net_device *dev)
> +{
> + struct sk_buff *skb = {0};
> +
> + do_send(conn, skb);
> + return 0;
> +}
> +
> +/* Packet to BT LE device */
> +static int send_pkt(struct l2cap_conn *conn, const void *saddr,
> + const void *daddr, struct sk_buff *skb,
> + struct net_device *dev)
This goes for all the function, we need to follow the network subsystem coding style. Aka calling checkpatch.pl with --strict or the better name —subjective.
I know that there are still bad examples in some places, but for new code, we have to follow it.
> +{
> + raw_dump_table(__func__, "raw skb data dump before fragmentation",
> + skb->data, skb->len);
> +
> + return conn_send(conn, skb->data, skb->len, 0, dev);
> +}
> +
> +static netdev_tx_t xmit(struct sk_buff *skb, struct net_device *dev)
> +{
> + int err = -1;
> +
> + pr_debug("ble 6lowpan packet xmit\n");
> +
> + if (lowpan_info(dev)->conn)
> + err = send_pkt(lowpan_info(dev)->conn,
> + dev->dev_addr,
> + &lowpan_info(dev)->ieee802154_addr,
> + skb,
> + dev);
> + else
> + BT_DBG("ERROR: no BT LE 6LoWPAN device found”);
Can this case actually happen? In case our LE connection goes away, we should just flush all queues, bring the netdev down and unregister it.
> +
> + dev_kfree_skb(skb);
> +
> + if (err)
> + BT_DBG("ERROR: xmit failed (%d)", err);
> +
> + return (err < 0) ? NET_XMIT_DROP : err;
> +}
> +
> +static const struct net_device_ops netdev_ops = {
> + .ndo_start_xmit = xmit,
> +};
> +
> +static void setup(struct net_device *dev)
Maybe netdev_setup, lowpan_netdev, rawip_setup or something is better name than just setup.
> +{
> + dev->addr_len = IEEE802154_ADDR_LEN;
> + dev->type = ARPHRD_RAWIP;
> +
> + dev->hard_header_len = 0;
> + dev->needed_tailroom = 0;
> + dev->mtu = IPV6_MIN_MTU;
> + dev->tx_queue_len = 0;
> + dev->flags = IFF_RUNNING | IFF_POINTOPOINT;
> + dev->watchdog_timeo = 0;
> +
> + dev->netdev_ops = &netdev_ops;
> + dev->destructor = free_netdev;
> +}
> +
> +static struct device_type bt_type = {
> + .name = "bluetooth",
> +};
> +
> +static void set_addr(u8 *eui, u8 *addr, u8 addr_type)
> +{
> + /* addr is the BT address in little-endian format */
> + eui[0] = addr[5];
> + eui[1] = addr[4];
> + eui[2] = addr[3];
> + eui[3] = 0xFF;
> + eui[4] = 0xFE;
> + eui[5] = addr[2];
> + eui[6] = addr[1];
> + eui[7] = addr[0];
> +
> + eui[0] ^= 2;
> +
> + if (addr_type == BDADDR_LE_PUBLIC)
> + eui[0] &= ~1;
> + else
> + eui[0] |= 1;
I would quote the RFC here to mention how the address is assigned.
> +}
> +
> +static void set_dev_addr(struct net_device *net, bdaddr_t *addr,
> + u8 addr_type)
> +{
> + net->addr_assign_type = NET_ADDR_PERM;
> + set_addr(net->dev_addr, addr->b, addr_type);
> + net->dev_addr[0] ^= 2;
> +}
> +
> +static void ifup(struct net_device *net)
> +{
> + int status;
> +
> + rtnl_lock();
> + if ((status = dev_open(net)) < 0)
Assign it to status first and then check status. I know it is valid C code, but we normally don’t do this. Or if we did in the past, we are stepping away from these constructs.
Also you might want to call the variable err instead of status. I do not know where the status is coming from. At least in the Bluetooth subsystem we never used it like that. Is that some netdev thing?
> + BT_INFO("iface %s cannot be opened (%d)", net->name, status);
> + rtnl_unlock();
> +}
> +
> +/*
> + * This gets called when BT LE 6LoWPAN device is connected. We then
> + * create network device that acts as a proxy between BT LE device
> + * and kernel network stack.
> + */
> +int bt_6lowpan_add_conn(struct l2cap_conn *conn)
> +{
> + struct net_device *net;
> + struct lowpan_info *dev;
> + struct lowpan_dev *entry;
> + struct inet6_dev *idev;
> + int status;
> +
> + net = alloc_netdev(sizeof(struct lowpan_info), IFACE_NAME_TEMPLATE,
> + setup);
This ones also need to properly aligned according to the network subsystem coding style.
> + if (!net)
> + return -ENOMEM;
> +
> + dev = netdev_priv(net);
> + dev->net = net;
> +
> + memcpy(&dev->myaddr, &conn->hcon->src, sizeof(bdaddr_t));
> + memcpy(&dev->addr, &conn->hcon->dst, sizeof(bdaddr_t));
Do we need to really store these addresses? It is rather useless to just store the address, we also need to store the address type.
> +
> + set_dev_addr(net, &dev->myaddr, conn->hcon->src_type);
> +
> + dev->conn = conn;
> +
> + net->netdev_ops = &netdev_ops;
> + SET_NETDEV_DEV(net, &conn->hcon->dev);
> + SET_NETDEV_DEVTYPE(net, &bt_type);
> +
> + status = register_netdev(net);
> + if (status < 0) {
Same here. I would use err instead of status. Maybe ret in the cases where it makes more sense. Personally I prefer actually err.
> + BT_INFO("register_netdev failed %d", status);
> + free_netdev(net);
I think you better create an error label for this and use goto.
> + return status;
> + }
> +
> + BT_DBG("ifindex %d peer bdaddr %pMR my addr %pMR",
> + net->ifindex, &dev->addr, &dev->myaddr);
> + dev->ifindex = net->ifindex;
> + set_bit(__LINK_STATE_PRESENT, &net->state);
> +
> + idev = in6_dev_get(net);
> + if (idev) {
> + idev->cnf.autoconf = 1;
> + idev->cnf.forwarding = 1;
> + idev->cnf.accept_ra = 2;
> +
> + in6_dev_put(idev);
> + }
> +
> + entry = kzalloc(sizeof(struct lowpan_dev), GFP_KERNEL);
> + if (!entry)
> + return -ENOMEM;
Isn’t this leaking the net_device.
> +
> + entry->dev = net;
> +
> + write_lock(&net_dev_list_lock);
> + INIT_LIST_HEAD(&entry->list);
> + list_add(&entry->list, &bt_6lowpan_devices);
> + write_unlock(&net_dev_list_lock);
> +
> + ifup(net);
> +
> + return 0;
> +}
> +
> +static void delete_timeout(struct work_struct *work)
> +{
> + struct lowpan_dev *entry = container_of(work, struct lowpan_dev,
> + delete_timer.work);
> +
> + unregister_netdev(entry->dev);
> + kfree(entry);
> +}
I was wondering why we need this. You might need to explain it so I stop asking stupid questions. At least for me this is not obvious.
> +
> +int bt_6lowpan_del_conn(struct l2cap_conn *conn)
> +{
> + struct lowpan_dev *entry, *tmp;
> + int status = -ENOENT;
> +
> + write_lock(&net_dev_list_lock);
> +
> + list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
> + if (lowpan_info(entry->dev)->conn == conn) {
> + list_del(&entry->list);
> + status = 0;
> + break;
> + }
> + }
> +
> + write_unlock(&net_dev_list_lock);
> +
> + if (!status) {
> + INIT_DELAYED_WORK(&entry->delete_timer, delete_timeout);
> + schedule_delayed_work(&entry->delete_timer, DELETE_TIMEOUT);
> + }
> +
> + return status;
> +}
> +
> +static int device_event(struct notifier_block *unused,
> + unsigned long event, void *ptr)
> +{
> + struct net_device *dev = netdev_notifier_info_to_dev(ptr);
> + struct lowpan_dev *entry, *tmp;
> +
> + if (dev->type != ARPHRD_RAWIP)
> + return NOTIFY_DONE;
> +
> + switch (event) {
> + case NETDEV_UNREGISTER:
> + write_lock(&net_dev_list_lock);
> + list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices,
> + list) {
> + if (entry->dev == dev) {
> + list_del(&entry->list);
> + kfree(entry);
> + break;
> + }
> + }
> + write_unlock(&net_dev_list_lock);
> + break;
> + }
> +
> + return NOTIFY_DONE;
> +}
I think we have a bit of too much duplicated code that is all just deleting the device. Can we clean this out please.
> +
> +static struct notifier_block bt_6lowpan_dev_notifier = {
> + .notifier_call = device_event,
> +};
> +
> +int bt_6lowpan_init(void)
> +{
> + return register_netdevice_notifier(&bt_6lowpan_dev_notifier);
> +}
> +
> +void bt_6lowpan_cleanup(void)
> +{
> + unregister_netdevice_notifier(&bt_6lowpan_dev_notifier);
> +}
> diff --git a/net/bluetooth/6lowpan.h b/net/bluetooth/6lowpan.h
> new file mode 100644
> index 0000000..680eac8
> --- /dev/null
> +++ b/net/bluetooth/6lowpan.h
> @@ -0,0 +1,26 @@
> +/*
> + Copyright (c) 2013 Intel Corp.
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License version 2 and
> + only version 2 as published by the Free Software Foundation.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +*/
> +
> +#ifndef __6LOWPAN_H
> +#define __6LOWPAN_H
> +
> +#include <linux/skbuff.h>
> +#include <net/bluetooth/l2cap.h>
> +
> +int bt_6lowpan_recv(struct l2cap_conn *conn, struct sk_buff *skb);
> +int bt_6lowpan_add_conn(struct l2cap_conn *conn);
> +int bt_6lowpan_del_conn(struct l2cap_conn *conn);
> +int bt_6lowpan_init(void);
> +void bt_6lowpan_cleanup(void);
> +
> +#endif /* __6LOWPAN_H */
> diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
> index 6a791e7..80cb215 100644
> --- a/net/bluetooth/Makefile
> +++ b/net/bluetooth/Makefile
> @@ -10,6 +10,6 @@ obj-$(CONFIG_BT_HIDP) += hidp/
>
> bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \
> hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
> - a2mp.o amp.o
> + a2mp.o amp.o 6lowpan.o
>
> subdir-ccflags-y += -D__CHECK_ENDIAN__
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 0cef677..c47215f 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -40,6 +40,7 @@
> #include "smp.h"
> #include "a2mp.h"
> #include "amp.h"
> +#include "6lowpan.h"
>
> bool disable_ertm;
>
> @@ -6470,6 +6471,10 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
> l2cap_conn_del(conn->hcon, EACCES);
> break;
>
> + case L2CAP_FC_6LOWPAN:
> + bt_6lowpan_recv(conn, skb);
> + break;
> +
> default:
> l2cap_data_channel(conn, cid, skb);
> break;
> @@ -6507,6 +6512,11 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
> return exact ? lm1 : lm2;
> }
>
> +static bool is_bt_6lowpan(void)
> +{
> + return false;
> +}
> +
> void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
> {
> struct l2cap_conn *conn;
> @@ -6515,8 +6525,12 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
>
> if (!status) {
> conn = l2cap_conn_add(hcon);
> - if (conn)
> + if (conn) {
> l2cap_conn_ready(conn);
> +
> + if (hcon->type == LE_LINK && is_bt_6lowpan())
> + bt_6lowpan_add_conn(conn);
So I am actually thinking that we might be a bit more aggressive with this code. At least this gives us a bit better testing exposure.
One idea might be to just create a hdev->dev_flags with HCI_6LOWPAN_ENABLED that you can set via debugfs (which defaults to off). And for every LE connection we have a hcon->flags with HCI_CONN_6LOWPAN that defaults to the value from hdev. And we just try to run 6loWPAN. Only if it fails, we delete the net_device.
Since this code is still in testing, we can be a bit more aggressive. Actually I like to see what happens if we have LE connections and use 6loWPAN against other LE devices that do not have it.
> + }
> } else {
> l2cap_conn_del(hcon, bt_to_errno(status));
> }
> @@ -6537,6 +6551,9 @@ void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
> {
> BT_DBG("hcon %p reason %d", hcon, reason);
>
> + if (hcon->type == LE_LINK && is_bt_6lowpan())
> + bt_6lowpan_del_conn(hcon->l2cap_data);
Is using l2cap_data here really a good idea. Don’t you have l2cap_conn or l2cap_chan available.
> +
> l2cap_conn_del(hcon, bt_to_errno(reason));
> }
>
> @@ -6814,11 +6831,14 @@ int __init l2cap_init(void)
> l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,
> NULL, &l2cap_debugfs_fops);
>
> + bt_6lowpan_init();
> +
> return 0;
> }
>
> void l2cap_exit(void)
> {
> + bt_6lowpan_cleanup();
> debugfs_remove(l2cap_debugfs);
> l2cap_cleanup_sockets();
> }
Regards
Marcel
^ permalink raw reply
* Re: l2cap sockets not properly multiplexed on ARM
From: Alexander Holler @ 2013-10-30 11:46 UTC (permalink / raw)
To: Tim Tisdall; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <5270EC62.6070705@ahsoftware.de>
Am 30.10.2013 12:24, schrieb Alexander Holler:
> Am 29.10.2013 21:44, schrieb Tim Tisdall:
>
>> L2CAP sockets
>> -------------
>>
>> socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)
>> bind(bdaddr, 0) // bind to bluetooth address and PSM 0 (Python
>> doesn't support LE directly,
>> // but this is enough for binding to the right device
>
> That looks wrong. Try to bind to ATT_CID (4).
>
And don't forget to check the return code of bind (as well as of
setsockopt and other calls).
Regards,
Alexander Holler
^ permalink raw reply
* Re: [PATCH] android: Disable format warnings in Android
From: Marcel Holtmann @ 2013-10-30 11:25 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth@vger.kernel.org development
In-Reply-To: <1383129043-30582-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
Hi Andrei,
> Android's bionic library has bug defining ssize_t (which is fixed in
> Android 4.3). This seems to be the most appropriate solution until
> we move to Android 4.3.
> ---
> android/Android.mk | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/android/Android.mk b/android/Android.mk
> index fc1b276..db55d37 100644
> --- a/android/Android.mk
> +++ b/android/Android.mk
> @@ -12,6 +12,10 @@ BLUEZ_COMMON_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\"
> # Disable warnings enabled by Android but not enabled in autotools build
> BLUEZ_COMMON_CFLAGS += -Wno-pointer-arith
>
> +# Disable warning: format '%zd' expects argument of type 'signed size_t',
> +# but argument 4 has type 'ssize_t'
> +BLUEZ_COMMON_CFLAGS += -Wno-format
this disables now all format warnings. Even the useful ones. I am not in favor of doing this since it just leads to more error that otherwise the compiler would have caught.
Regards
Marcel
^ permalink raw reply
* Re: l2cap sockets not properly multiplexed on ARM
From: Alexander Holler @ 2013-10-30 11:24 UTC (permalink / raw)
To: Tim Tisdall; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <D9B9EB3A112B8F489DFFA00A6D5C0FE20324078F@AD-BR-EX-2.adroot.flemingc.local>
Am 29.10.2013 21:44, schrieb Tim Tisdall:
> L2CAP sockets
> -------------
>
> socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)
> bind(bdaddr, 0) // bind to bluetooth address and PSM 0 (Python doesn't support LE directly,
> // but this is enough for binding to the right device
That looks wrong. Try to bind to ATT_CID (4).
Regards,
Alexander Holler
^ permalink raw reply
* [PATCH] android: Fix sending scan mode property
From: Szymon Janc @ 2013-10-30 11:23 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
This fix setting adapter discoverable from Android UI.
This type is enum on HAL side and we need to pass right number of
bytes. Otherwise will get exceptions from Java TLV handling code.
This patch makes assumption that size of enum is 4 bytes.
---
android/adapter.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/adapter.c b/android/adapter.c
index 15b65e5..16db4dd 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -87,7 +87,7 @@ static void powered_changed(void)
HAL_EV_ADAPTER_STATE_CHANGED, sizeof(ev), &ev, -1);
}
-static uint8_t settings2scan_mode(void)
+static uint32_t settings2scan_mode(void)
{
bool connectable, discoverable;
@@ -106,9 +106,9 @@ static uint8_t settings2scan_mode(void)
static void scan_mode_changed(void)
{
struct hal_ev_adapter_props_changed *ev;
- uint8_t *mode;
+ uint32_t mode;
int len;
- len = sizeof(*ev) + sizeof(struct hal_property) + 1;
+ len = sizeof(*ev) + sizeof(struct hal_property) + sizeof(mode);
ev = g_malloc(len);
@@ -116,12 +116,12 @@ static void scan_mode_changed(void)
ev->status = HAL_STATUS_SUCCESS;
ev->props[0].type = HAL_PROP_ADAPTER_SCAN_MODE;
- ev->props[0].len = 1;
+ ev->props[0].len = sizeof(mode);
- mode = ev->props[0].val;
- *mode = settings2scan_mode();
+ mode = settings2scan_mode();
+ memcpy(ev->props[0].val, &mode, sizeof(mode));
- DBG("mode %u", *mode);
+ DBG("mode %u", mode);
ipc_send(notification_io, HAL_SERVICE_ID_BLUETOOTH,
HAL_EV_ADAPTER_PROPS_CHANGED, len, ev, -1);
--
1.8.4.1
^ permalink raw reply related
* [PATCH] android: Disable format warnings in Android
From: Andrei Emeltchenko @ 2013-10-30 10:30 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Android's bionic library has bug defining ssize_t (which is fixed in
Android 4.3). This seems to be the most appropriate solution until
we move to Android 4.3.
---
android/Android.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/android/Android.mk b/android/Android.mk
index fc1b276..db55d37 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -12,6 +12,10 @@ BLUEZ_COMMON_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\"
# Disable warnings enabled by Android but not enabled in autotools build
BLUEZ_COMMON_CFLAGS += -Wno-pointer-arith
+# Disable warning: format '%zd' expects argument of type 'signed size_t',
+# but argument 4 has type 'ssize_t'
+BLUEZ_COMMON_CFLAGS += -Wno-format
+
#
# Android BlueZ daemon (bluetoothd)
#
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH v2 0/6] Initial HAL support for device discovery
From: Johan Hedberg @ 2013-10-30 10:13 UTC (permalink / raw)
To: Jakub Tyszkowski; +Cc: linux-bluetooth
In-Reply-To: <1383127232-25147-1-git-send-email-jakub.tyszkowski@tieto.com>
Hi Jakub,
On Wed, Oct 30, 2013, Jakub Tyszkowski wrote:
> v2 Changes:
> * fixed coding style issues pointed by jhe and niko1
> * extracted property repacking code for reuse
>
> Jakub Tyszkowski (6):
> android/hal: Add support for start/cancel device discovery commands
> android/hal: Add support for handling discovery state change event
> android/hal: Extract bt property repacking code for further reuse
> android/hal: Add device found event handler
> android/hal: Add device state changed event handler
> android: Add missing discovery state definitions to IPC header
>
> android/hal-bluetooth.c | 92 +++++++++++++++++++++++++++++++++++++++----------
> android/hal-msg.h | 3 ++
> 2 files changed, 76 insertions(+), 19 deletions(-)
All patches have been applied. Thanks.
Johan
^ permalink raw reply
* Re: [PATCH 1/2] android: Add common place for adding compiler flags in Android.mk
From: Johan Hedberg @ 2013-10-30 10:10 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
In-Reply-To: <1383060218-25693-1-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Tue, Oct 29, 2013, Szymon Janc wrote:
> This will contain CFLAGS common for all BlueZ code.
> ---
> android/Android.mk | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
Both patches have been applied. Thanks.
Johan
^ permalink raw reply
* Re: [PATCH v2] android/client: Fix crash in tab completion
From: Johan Hedberg @ 2013-10-30 10:07 UTC (permalink / raw)
To: Jerzy Kasenberg; +Cc: linux-bluetooth
In-Reply-To: <1383125472-6813-1-git-send-email-jerzy.kasenberg@tieto.com>
Hi Jerzy,
On Wed, Oct 30, 2013, Jerzy Kasenberg wrote:
> When user pressed tab on third or later argument when
> first two did not make sense tool crashed.
> Now method is checked for NULL before accessing help field.
> ---
> First version was doing to much (crash was gone but so was
> completion when completion function was not provided, just help
> string)
>
> android/client/tabcompletion.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied. Thanks.
Johan
^ permalink raw reply
* [PATCH v2 6/6] android: Add missing discovery state definitions to IPC header
From: Jakub Tyszkowski @ 2013-10-30 10:00 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383127232-25147-1-git-send-email-jakub.tyszkowski@tieto.com>
---
android/hal-msg.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 80b47d6..d2a0e2a 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -348,6 +348,9 @@ struct hal_ev_device_found {
struct hal_property props[0];
} __attribute__((packed));
+#define HAL_DISCOVERY_STATE_STOPPED 0x00
+#define HAL_DISCOVERY_STATE_STARTED 0x01
+
#define HAL_EV_DISCOVERY_STATE_CHANGED 0x85
struct hal_ev_discovery_state_changed {
uint8_t state;
--
1.8.4.1
^ permalink raw reply related
* [PATCH v2 5/6] android/hal: Add device state changed event handler
From: Jakub Tyszkowski @ 2013-10-30 10:00 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383127232-25147-1-git-send-email-jakub.tyszkowski@tieto.com>
This is used to report property change of already reported remote
device.
---
android/hal-bluetooth.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 3f9df96..2237063 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -145,6 +145,21 @@ static void handle_device_found(void *buf, uint16_t len)
bt_hal_cbacks->device_found_cb(ev->num_props, props);
}
+static void handle_device_state_changed(void *buf, uint16_t len)
+{
+ struct hal_ev_remote_device_props *ev = buf;
+ bt_property_t props[ev->num_props];
+
+ if (!bt_hal_cbacks->remote_device_properties_cb)
+ return;
+
+ repack_properties(props, ev->props, ev->num_props, buf + len);
+
+ bt_hal_cbacks->remote_device_properties_cb(ev->status,
+ (bt_bdaddr_t *)ev->bdaddr,
+ ev->num_props, props);
+}
+
/* will be called from notification thread context */
void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
{
@@ -164,6 +179,9 @@ void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
case HAL_EV_DEVICE_FOUND:
handle_device_found(buf, len);
break;
+ case HAL_EV_REMOTE_DEVICE_PROPS:
+ handle_device_state_changed(buf, len);
+ break;
case HAL_EV_BOND_STATE_CHANGED:
handle_bond_state_change(buf);
break;
--
1.8.4.1
^ permalink raw reply related
* [PATCH v2 4/6] android/hal: Add device found event handler
From: Jakub Tyszkowski @ 2013-10-30 10:00 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383127232-25147-1-git-send-email-jakub.tyszkowski@tieto.com>
This is called when new remote device is found.
---
android/hal-bluetooth.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 06d85e3..3f9df96 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -132,6 +132,19 @@ static void handle_discovery_state_changed(void *buf)
bt_hal_cbacks->discovery_state_changed_cb(ev->state);
}
+static void handle_device_found(void *buf, uint16_t len)
+{
+ struct hal_ev_device_found *ev = buf;
+ bt_property_t props[ev->num_props];
+
+ if (!bt_hal_cbacks->device_found_cb)
+ return;
+
+ repack_properties(props, ev->props, ev->num_props, buf + len);
+
+ bt_hal_cbacks->device_found_cb(ev->num_props, props);
+}
+
/* will be called from notification thread context */
void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
{
@@ -148,6 +161,9 @@ void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
case HAL_EV_DISCOVERY_STATE_CHANGED:
handle_discovery_state_changed(buf);
break;
+ case HAL_EV_DEVICE_FOUND:
+ handle_device_found(buf, len);
+ break;
case HAL_EV_BOND_STATE_CHANGED:
handle_bond_state_change(buf);
break;
--
1.8.4.1
^ permalink raw reply related
* [PATCH v2 3/6] android/hal: Extract bt property repacking code for further reuse
From: Jakub Tyszkowski @ 2013-10-30 10:00 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383127232-25147-1-git-send-email-jakub.tyszkowski@tieto.com>
This extracted part of code can be reused for repacking remote device
properties.
---
android/hal-bluetooth.c | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 18a5e1c..06d85e3 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -37,33 +37,38 @@ static void handle_adapter_state_changed(void *buf)
bt_hal_cbacks->adapter_state_changed_cb(ev->state);
}
-static void handle_adapter_props_changed(void *buf, uint16_t len)
+static void repack_properties(bt_property_t *send_props,
+ struct hal_property *hal_prop,
+ uint8_t num_props,
+ void *buff_end)
{
- struct hal_ev_adapter_props_changed *ev = buf;
- bt_property_t props[ev->num_props];
- struct hal_property *hal_prop;
- void *p;
- int i;
+ void *p = hal_prop;
+ uint8_t i;
- if (!bt_hal_cbacks->adapter_properties_cb)
- return;
-
- hal_prop = ev->props;
- p = ev->props;
-
- for (i = 0; i < ev->num_props; i++) {
- if (p + sizeof(*hal_prop) + hal_prop->len > buf + len) {
+ for (i = 0; i < num_props; i++) {
+ if (p + sizeof(*hal_prop) + hal_prop->len > buff_end) {
error("invalid adapter properties event, aborting");
exit(EXIT_FAILURE);
}
- props[i].type = hal_prop->type;
- props[i].len = hal_prop->len;
- props[i].val = hal_prop->val;
+ send_props[i].type = hal_prop->type;
+ send_props[i].len = hal_prop->len;
+ send_props[i].val = hal_prop->val;
p += sizeof(*hal_prop) + hal_prop->len;
hal_prop = p;
}
+}
+
+static void handle_adapter_props_changed(void *buf, uint16_t len)
+{
+ struct hal_ev_adapter_props_changed *ev = buf;
+ bt_property_t props[ev->num_props];
+
+ if (!bt_hal_cbacks->adapter_properties_cb)
+ return;
+
+ repack_properties(props, ev->props, ev->num_props, buf + len);
bt_hal_cbacks->adapter_properties_cb(ev->status, ev->num_props, props);
}
--
1.8.4.1
^ permalink raw reply related
* [PATCH v2 2/6] android/hal: Add support for handling discovery state change event
From: Jakub Tyszkowski @ 2013-10-30 10:00 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383127232-25147-1-git-send-email-jakub.tyszkowski@tieto.com>
---
android/hal-bluetooth.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 9d1c3f7..18a5e1c 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -119,6 +119,14 @@ static bool interface_ready(void)
return bt_hal_cbacks != NULL;
}
+static void handle_discovery_state_changed(void *buf)
+{
+ struct hal_ev_discovery_state_changed *ev = buf;
+
+ if (bt_hal_cbacks->discovery_state_changed_cb)
+ bt_hal_cbacks->discovery_state_changed_cb(ev->state);
+}
+
/* will be called from notification thread context */
void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
{
@@ -132,6 +140,9 @@ void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
case HAL_EV_ADAPTER_PROPS_CHANGED:
handle_adapter_props_changed(buf, len);
break;
+ case HAL_EV_DISCOVERY_STATE_CHANGED:
+ handle_discovery_state_changed(buf);
+ break;
case HAL_EV_BOND_STATE_CHANGED:
handle_bond_state_change(buf);
break;
--
1.8.4.1
^ permalink raw reply related
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