by Arman Uguray

[permalink] [raw]

Subject: [PATCH BlueZ v1 03/12] shared/gatt-client: Set op->success correctly

This patch fixes a bug where not correctly setting the success field of
the discovery_op instance when gatt-client is initialized with a
non-empty db caused the db to get cleared by the init_failure handler.
---
src/shared/gatt-client.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 33ed633..d7c5ca7 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -928,6 +928,8 @@ static void exchange_mtu_cb(bool success, uint8_t att_ecode, void *user_data)
struct discovery_op *op = user_data;
struct bt_gatt_client *client = op->client;

+ op->success = success;
+
if (!success) {
util_debug(client->debug_callback, client->debug_data,
"MTU Exchange failed. ATT ECODE: 0x%02x",
@@ -1223,6 +1225,8 @@ fail:
util_debug(client->debug_callback, client->debug_data,
"Failed to initialize gatt-client");

+ op->success = false;
+
done:
if (client->ready_callback)
client->ready_callback(success, att_ecode, client->ready_data);
--
2.2.0.rc0.207.ga3a616c

2014-12-09 23:00:55

by Arman Uguray

[permalink] [raw]

Subject: [PATCH BlueZ v1 02/12] shared/att: Add err argument to disconnect cb

This patch adds an "int err" argument to the disconnect callback.
shared/att obtains the value of SO_ERROR option for the underlying
fd and passes it to the callbacks.
---
src/shared/att.c | 23 ++++++++++++++++++-----
src/shared/att.h | 2 +-
src/shared/gatt-client.c | 2 +-
tools/btgatt-client.c | 4 ++--
tools/btgatt-server.c | 4 ++--
5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/shared/att.c b/src/shared/att.c
index 26b6c5b..99bbb6c 100644
--- a/src/shared/att.c
+++ b/src/shared/att.c
@@ -536,29 +536,42 @@ static void wakeup_writer(struct bt_att *att)
static void disconn_handler(void *data, void *user_data)
{
struct att_disconn *disconn = data;
+ int err = PTR_TO_INT(user_data);

if (disconn->removed)
return;

if (disconn->callback)
- disconn->callback(disconn->user_data);
+ disconn->callback(err, disconn->user_data);
}

static bool disconnect_cb(struct io *io, void *user_data)
{
struct bt_att *att = user_data;
+ int err;
+ socklen_t len;

- io_destroy(att->io);
- att->io = NULL;
+ len = sizeof(err);
+
+ if (getsockopt(att->fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
+ util_debug(att->debug_callback, att->debug_data,
+ "Failed to obtain disconnect error: %s",
+ strerror(errno));
+ err = 0;
+ }

util_debug(att->debug_callback, att->debug_data,
- "Physical link disconnected");
+ "Physical link disconnected: %s",
+ strerror(err));
+
+ io_destroy(att->io);
+ att->io = NULL;

bt_att_cancel_all(att);

bt_att_ref(att);
att->in_disconn = true;
- queue_foreach(att->disconn_list, disconn_handler, NULL);
+ queue_foreach(att->disconn_list, disconn_handler, INT_TO_PTR(err));
att->in_disconn = false;

if (att->need_disconn_cleanup) {
diff --git a/src/shared/att.h b/src/shared/att.h
index 99b5a5b..cd00a1e 100644
--- a/src/shared/att.h
+++ b/src/shared/att.h
@@ -43,7 +43,7 @@ typedef void (*bt_att_destroy_func_t)(void *user_data);
typedef void (*bt_att_debug_func_t)(const char *str, void *user_data);
typedef void (*bt_att_timeout_func_t)(unsigned int id, uint8_t opcode,
void *user_data);
-typedef void (*bt_att_disconnect_func_t)(void *user_data);
+typedef void (*bt_att_disconnect_func_t)(int err, void *user_data);

bool bt_att_set_debug(struct bt_att *att, bt_att_debug_func_t callback,
void *user_data, bt_att_destroy_func_t destroy);
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 463de3b..33ed633 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -1483,7 +1483,7 @@ static void bt_gatt_client_free(struct bt_gatt_client *client)
free(client);
}

-static void att_disconnect_cb(void *user_data)
+static void att_disconnect_cb(int err, void *user_data)
{
struct bt_gatt_client *client = user_data;
bool in_init = client->in_init;
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
index 015142d..e2e0537 100644
--- a/tools/btgatt-client.c
+++ b/tools/btgatt-client.c
@@ -74,9 +74,9 @@ static void print_prompt(void)
fflush(stdout);
}

-static void att_disconnect_cb(void *user_data)
+static void att_disconnect_cb(int err, void *user_data)
{
- printf("Device disconnected\n");
+ printf("Device disconnected: %s\n", strerror(err));

mainloop_quit();
}
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 1a9b9fb..f6ad8c3 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -101,9 +101,9 @@ static void print_prompt(void)
fflush(stdout);
}

-static void att_disconnect_cb(void *user_data)
+static void att_disconnect_cb(int err, void *user_data)
{
- printf("Device disconnected\n");
+ printf("Device disconnected: %s\n", strerror(err));

mainloop_quit();
}
--
2.2.0.rc0.207.ga3a616c