Skip to contentSkip to conversation

gatt-client: allow AcquireNotify when characteristic has indicate flag

PATCH In review Benedek Kupper 3 participants 3 messages Aug 22, 2024 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gatt-client: allow AcquireNotify when characteristic has indicate flag

From: Benedek Kupper <[email protected]>

StartNotify / StopNotify already correctly allows usage when the characteristic indicate is present (simplify this check though), apply the same to AcquireNotify.

---
 src/gatt-client.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
src/gatt-client.c +4 -3
index 8d83a9577..a67e04eee 100644
@@ -1556,7 +1556,8 @@ static DBusMessage *characteristic_acquire_notify(DBusConnection *conn,
 	if (!queue_isempty(chrc->notify_clients))
 		return btd_error_in_progress(msg);
 
-	if (!(chrc->props & BT_GATT_CHRC_PROP_NOTIFY))
+	if (!(chrc->props & (BT_GATT_CHRC_PROP_NOTIFY |
+			BT_GATT_CHRC_PROP_INDICATE)))
 		return btd_error_not_supported(msg);
 
 	client = notify_client_create(chrc, sender);
@@ -1601,8 +1602,8 @@ static DBusMessage *characteristic_start_notify(DBusConnection *conn,
 	if (chrc->notify_io)
 		return btd_error_not_permitted(msg, "Notify acquired");
 
-	if (!(chrc->props & BT_GATT_CHRC_PROP_NOTIFY ||
-				chrc->props & BT_GATT_CHRC_PROP_INDICATE))
+	if (!(chrc->props & (BT_GATT_CHRC_PROP_NOTIFY |
+				BT_GATT_CHRC_PROP_INDICATE)))
 		return btd_error_not_supported(msg);
 
 	/* Each client can only have one active notify session. */
Signature · 1 line
2.34.1
#1 lore raw

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=882131

---Test result---

Test Summary:

CheckPatch                    PASS      0.46 seconds
GitLint                       PASS      0.32 seconds
BuildEll                      PASS      24.50 seconds
BluezMake                     PASS      1685.40 seconds
MakeCheck                     FAIL      13.82 seconds
MakeDistcheck                 FAIL      159.20 seconds
CheckValgrind                 FAIL      251.10 seconds
CheckSmatch                   PASS      353.95 seconds
bluezmakeextell               PASS      119.71 seconds
IncrementalBuild              PASS      1440.61 seconds
ScanBuild                     PASS      1031.19 seconds

Details
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:

make[3]: *** [Makefile:11766: test-suite.log] Error 1 make[2]: *** [Makefile:11874: check-TESTS] Error 2 make[1]: *** [Makefile:12303: check-am] Error 2
make: *** [Makefile:12305: check] Error 2
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:

Package cups was not found in the pkg-config search path. Perhaps you should add the directory containing `cups.pc' to the PKG_CONFIG_PATH environment variable
No package 'cups' found
make[4]: *** [Makefile:11766: test-suite.log] Error 1 make[3]: *** [Makefile:11874: check-TESTS] Error 2 make[2]: *** [Makefile:12303: check-am] Error 2 make[1]: *** [Makefile:12305: check] Error 2
make: *** [Makefile:12226: distcheck] Error 1
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:

tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12725 | int main(int argc, char *argv[])

      |     ^~~~

make[3]: *** [Makefile:11766: test-suite.log] Error 1 make[2]: *** [Makefile:11874: check-TESTS] Error 2 make[1]: *** [Makefile:12303: check-am] Error 2
make: *** [Makefile:12305: check] Error 2

---
Regards,
Linux Bluetooth

#2 lore raw
In reply to Benedek Kupper

Hi Benedek,

Quoted 25 lines · Benedek Kupper

From: Benedek Kupper <[email protected]>

StartNotify / StopNotify already correctly allows usage when the characteristic indicate is present (simplify this check though), apply the same to AcquireNotify.

---
 src/gatt-client.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
src/gatt-client.c +2 -1
index 8d83a9577..a67e04eee 100644
@@ -1556,7 +1556,8 @@ static DBusMessage *characteristic_acquire_notify(DBusConnection *conn,
        if (!queue_isempty(chrc->notify_clients))
                return btd_error_in_progress(msg);
 
-       if (!(chrc->props & BT_GATT_CHRC_PROP_NOTIFY))
+       if (!(chrc->props & (BT_GATT_CHRC_PROP_NOTIFY |
+                       BT_GATT_CHRC_PROP_INDICATE)))
                return btd_error_not_supported(msg);
 
        client = notify_client_create(chrc, sender);

src/gatt-client.c static DBusMessage *characteristic_start_notify(DBusConnection *conn, · line 1607

Quoted 8 lines
src/gatt-client.c +2 -2
@@ -1601,8 +1602,8 @@ static DBusMessage *characteristic_start_notify(DBusConnection *conn,
        if (chrc->notify_io)
                return btd_error_not_permitted(msg, "Notify acquired");
 
-       if (!(chrc->props & BT_GATT_CHRC_PROP_NOTIFY ||
-                               chrc->props & BT_GATT_CHRC_PROP_INDICATE))
+       if (!(chrc->props & (BT_GATT_CHRC_PROP_NOTIFY |
+                               BT_GATT_CHRC_PROP_INDICATE)))
                return btd_error_not_supported(msg);

Afaik this is working according to the documentation:

'Only works with characteristic that has NotifyAcquired property which relies on "notify" Flag and no other client have called StartNotify().'

https://github.com/bluez/bluez/blob/master/doc/org.bluez.GattCharacteristic.rst#fd-uint16-acquirenotifydict-options-optional[1]

So if we want it to work with Indication as well then we need to change the documentation to reflect these changes, indication does mean one need to confirm the reception which is something that would require some work if done via fd, but in the other hand I think we are auto confirming in case of D-Bus since that is using a D-Bus signals so perhaps it would be fine to do the same with fd as well.

Quoted 5 lines
src/gatt-client.c +0 -1
        /* Each client can only have one active notify session. */
--

2.34.1

Signature · 1 line
Luiz Augusto von Dentz