2016-12-01 20:16:01

by Petri Gynther

Subject: [PATCH 1/2] shared/gatt-client: Fix discover_primary_cb()

Fix the handling of primary services discovery failure.
---
src/shared/gatt-client.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 4386692..84145e7 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -1052,11 +1052,14 @@ static void discover_primary_cb(bool success, uint8_t att_ecode,
"Primary service discovery failed."
" ATT ECODE: 0x%02x", att_ecode);
/* Reset error in case of not found */
- if (BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND) {
+ switch (att_ecode) {
+ case BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND:
success = true;
att_ecode = 0;
+ goto secondary;
+ default:
+ goto done;
}
- goto secondary;
}

if (!result || !bt_gatt_iter_init(&iter, result)) {
--
2.8.0.rc3.226.g39d4020

2016-12-02 11:53:26

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] shared/gatt-client: Fix discover_primary_cb()

Hi Petri,

On Thu, Dec 1, 2016 at 10:46 PM, Luiz Augusto von Dentz
<[email protected]> wrote:
> Hi Petri,
>
> On Thu, Dec 1, 2016 at 10:16 PM, Petri Gynther <[email protected]> wrote:
>> Fix the handling of primary services discovery failure.
>> ---
>> src/shared/gatt-client.c | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
>> index 4386692..84145e7 100644
>> --- a/src/shared/gatt-client.c
>> +++ b/src/shared/gatt-client.c
>> @@ -1052,11 +1052,14 @@ static void discover_primary_cb(bool success, uint8_t att_ecode,
>> "Primary service discovery failed."
>> " ATT ECODE: 0x%02x", att_ecode);
>> /* Reset error in case of not found */
>> - if (BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND) {
>> + switch (att_ecode) {
>> + case BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND:
>> success = true;
>> att_ecode = 0;
>> + goto secondary;
>> + default:
>> + goto done;
>> }
>> - goto secondary;
>> }
>>
>> if (!result || !bt_gatt_iter_init(&iter, result)) {
>> --
>> 2.8.0.rc3.226.g39d4020
>
> Looks like we had similar idea, although this is probably better as
> other errors shall be cause the discovery to be interrupted.

Applied, thanks

--
Luiz Augusto von Dentz

2016-12-01 20:46:42

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] shared/gatt-client: Fix discover_primary_cb()

Hi Petri,

On Thu, Dec 1, 2016 at 10:16 PM, Petri Gynther <[email protected]> wrote:
> Fix the handling of primary services discovery failure.
> ---
> src/shared/gatt-client.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
> index 4386692..84145e7 100644
> --- a/src/shared/gatt-client.c
> +++ b/src/shared/gatt-client.c
> @@ -1052,11 +1052,14 @@ static void discover_primary_cb(bool success, uint8_t att_ecode,
> "Primary service discovery failed."
> " ATT ECODE: 0x%02x", att_ecode);
> /* Reset error in case of not found */
> - if (BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND) {
> + switch (att_ecode) {
> + case BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND:
> success = true;
> att_ecode = 0;
> + goto secondary;
> + default:
> + goto done;
> }
> - goto secondary;
> }
>
> if (!result || !bt_gatt_iter_init(&iter, result)) {
> --
> 2.8.0.rc3.226.g39d4020

Looks like we had similar idea, although this is probably better as
other errors shall be cause the discovery to be interrupted.


--
Luiz Augusto von Dentz

2016-12-01 20:16:02

by Petri Gynther

Subject: [PATCH 2/2] shared/gatt-client: Fix discover_secondary_cb()

If included services discovery cannot be started, the services discovery
operation has failed.
---
src/shared/gatt-client.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 84145e7..dc98aaa 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -1027,6 +1027,7 @@ next:
util_debug(client->debug_callback, client->debug_data,
"Failed to start included services discovery");
discovery_op_unref(op);
+ success = false;

done:
discovery_op_complete(op, success, att_ecode);
--
2.8.0.rc3.226.g39d4020