Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Curtis <curtis@maves.io>
To:     linux-bluetooth@vger.kernel.org
Cc:     Curtis <curtis@maves.io>
Message-ID: <20210219174946.599144-1-curtis@maves.io>
Subject: [PATCH BlueZ] gatt-database: Fix notifying on indicatable attr
Date:   Fri, 19 Feb 2021 12:49:46 -0500
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Precedence: bulk

When a local GATT characteristic has both the indicate and notify
properties, notifications will not be send to clients requesting them.
This change fixes this, allowing for notifications to be sent.

Also simplifies logic about when notifications/indications should
be sent.
---
 src/gatt-database.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/gatt-database.c b/src/gatt-database.c
index d635c3214..bd5864bcd 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -1344,10 +1344,7 @@ static void send_notification_to_device(void *data, =
void *user_data)
 =09}
=20
 =09ccc =3D find_ccc_state(device_state, notify->ccc_handle);
-=09if (!ccc)
-=09=09return;
-
-=09if (!ccc->value || (notify->conf && !(ccc->value & 0x0002)))
+=09if (!ccc || !(ccc->value & 0x0003))
 =09=09return;
=20
 =09device =3D btd_adapter_find_device(notify->database->adapter,
@@ -1374,7 +1371,7 @@ static void send_notification_to_device(void *data, v=
oid *user_data)
 =09 * TODO: If the device is not connected but bonded, send the
 =09 * notification/indication when it becomes connected.
 =09 */
-=09if (!notify->conf) {
+=09if (!(ccc->value & 0x0002)) {
 =09=09DBG("GATT server sending notification");
 =09=09bt_gatt_server_send_notification(server,
 =09=09=09=09=09notify->handle, notify->value,
@@ -2415,8 +2412,8 @@ static bool sock_io_read(struct io *io, void *user_da=
ta)
 =09=09=09=09gatt_db_attribute_get_handle(chrc->attrib),
 =09=09=09=09buf, bytes_read,
 =09=09=09=09gatt_db_attribute_get_handle(chrc->ccc),
-=09=09=09=09chrc->props & BT_GATT_CHRC_PROP_INDICATE ?
-=09=09=09=09conf_cb : NULL, chrc->proxy);
+=09=09=09=09conf_cb,
+=09=09=09=09chrc->proxy);
=20
 =09return true;
 }
@@ -2725,8 +2722,8 @@ static void property_changed_cb(GDBusProxy *proxy, co=
nst char *name,
 =09=09=09=09gatt_db_attribute_get_handle(chrc->attrib),
 =09=09=09=09value, len,
 =09=09=09=09gatt_db_attribute_get_handle(chrc->ccc),
-=09=09=09=09chrc->props & BT_GATT_CHRC_PROP_INDICATE ?
-=09=09=09=09conf_cb : NULL, proxy);
+=09=09=09=09conf_cb,
+=09=09=09=09proxy);
 }
=20
 static bool database_add_ccc(struct external_service *service,
--=20
2.30.1