gatt-db: Allow passing Characteristic Value to gatt_db_attribute_get_char_data
Luiz Augusto von Dentz
maintainerPATCH 1/1 gatt-db: Allow passing Characteristic Value to gatt_db_attribute_get_char_data
From: Luiz Augusto von Dentz <[email protected]>
This makes gatt_db_attribute_get_char_data work with Characteristic Value rather than only with Characteristic Declaration.
--- src/shared/gatt-db.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
src/shared/gatt-db.c +13 -3
@@ -1528,7 +1528,7 @@ void gatt_db_service_foreach_char(struct gatt_db_attribute *attrib,gatt_db_service_foreach (attrib, &characteristic_uuid, func, user_data); } -static int gatt_db_attribute_get_index (struct gatt_db_attribute *attrib) +static int gatt_db_attribute_get_index (const struct gatt_db_attribute *attrib) {struct gatt_db_service *service;int index;
@@ -1853,8 +1853,18 @@ bool gatt_db_attribute_get_char_data(const struct gatt_db_attribute *attrib,if (!attrib)return false; -if (bt_uuid_cmp (&characteristic_uuid, &attrib->uuid)) -return false; +if (bt_uuid_cmp (&characteristic_uuid, &attrib->uuid)) { +int index; + +/* Check if Characteristic Value was passed instead */ + index =gatt_db_attribute_get_index (attrib); +if (index <0 ) +return NULL ; + + attrib = attrib->service->attributes[index -1 ]; +if (bt_uuid_cmp (&characteristic_uuid, &attrib->uuid)) +return false; + }/* * Characteristic declaration value:
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH 1/1 service: Add initiator argument to service_accept
From: Luiz Augusto von Dentz <[email protected]>
This adds initiator argument to service_accept so profiles accepting the connection can use btd_service_is_initiator to determine if the connection was initiated locally (central) or remotely (peripheral).
--- src/device.c | 18 ++++++++++++++++-- src/service.c | 4 +++- src/service.h | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-)
src/device.c +16 -2
@@ -158,6 +158,7 @@ struct bearer_state {bool bonded;bool connected;bool svc_resolved; +bool initiator; };struct csrk_info {
@@ -297,6 +298,16 @@ static struct bearer_state *get_state(struct btd_device *dev,return &dev->le_state; } +static bool get_initiator (struct btd_device *dev) +{ +if (dev->le_state.connected) +return dev->le_state.initiator; +if (dev->bredr_state.connected) +return dev->bredr_state.initiator; + +return false; +} +static GSList *find_service_with_profile (GSList *list,struct btd_profile *p) {GSList *l;
@@ -3256,6 +3267,7 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)return ; state->connected = false; + state->initiator = false; device->general_connect = FALSE;device_set_svc_refreshed (device, false);
@@ -4169,7 +4181,7 @@ done: }/* Notify driver about the new connection */ -service_accept (service); +service_accept (service,get_initiator (device)); }static void device_add_gatt_services (struct btd_device *device)
@@ -4191,7 +4203,7 @@ static void device_accept_gatt_profiles(struct btd_device *device)GSList *l;for (l = device->services; l !=NULL ; l =g_slist_next (l)) -service_accept (l->data); +service_accept (l->data,get_initiator (device)); } static void device_remove_gatt_service(struct btd_device *device,
@@ -5899,6 +5911,8 @@ int device_connect_le(struct btd_device *dev)/* Keep this, so we can cancel the connection */ dev->att_io = io; +/* Set as initiator */ + dev->le_state.initiator = true;return 0 ; }
src/service.c +3 -1
@@ -172,7 +172,7 @@ void service_remove(struct btd_service *service)btd_service_unref (service); } -int service_accept (struct btd_service *service) +int service_accept (struct btd_service *service,bool initiator) {char addr[18 ];int err;
@@ -198,6 +198,8 @@ int service_accept(struct btd_service *service)return -ECONNABORTED ; } + service->initiator = initiator; + err = service->profile->accept (service);if (!err) goto done;
src/service.h +1 -1
@@ -35,7 +35,7 @@ struct btd_service *service_create(struct btd_device *device,int service_probe (struct btd_service *service);void service_remove (struct btd_service *service); -int service_accept (struct btd_service *service); +int service_accept (struct btd_service *service,bool initiator);int service_set_connecting (struct btd_service *service);/* Connection control API */
Signature · 1 line
2.35.1
RE: [BlueZ] service: Add initiator argument to service_accept
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=640777
---Test result---
Test Summary:
CheckPatch PASS 1.53 seconds GitLint PASS 0.98 seconds Prep - Setup ELL PASS 43.22 seconds Build - Prep PASS 0.72 seconds Build - Configure PASS 9.07 seconds Build - Make PASS 1293.83 seconds Make Check PASS 11.29 seconds Make Check w/Valgrind PASS 426.79 seconds Make Distcheck PASS 232.12 seconds Build w/ext ELL - Configure PASS 8.69 seconds Build w/ext ELL - Make PASS 1277.75 seconds Incremental Build with patchesPASS 0.00 seconds
---
Regards,
Linux Bluetooth
Re: [PATCH BlueZ] service: Add initiator argument to service_accept
In reply to Luiz Augusto von DentzThis patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Wed, 11 May 2022 17:55:15 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This adds initiator argument to
service_acceptso profiles accepting the connection can usebtd_service_is_initiatorto determine if the connection was initiated locally (central) or remotely (peripheral).--- src/device.c | 18 ++++++++++++++++-- src/service.c | 4 +++- src/service.h | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-)
Here is the summary with links:
- [BlueZ] service: Add initiator argument to service_accept
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=cd24715bb226
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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=640776
---Test result---
Test Summary:
CheckPatch PASS 1.66 seconds GitLint FAIL 1.10 seconds Prep - Setup ELL PASS 52.47 seconds Build - Prep PASS 0.82 seconds Build - Configure PASS 10.66 seconds Build - Make PASS 1520.85 seconds Make Check PASS 13.21 seconds Make Check w/Valgrind PASS 538.52 seconds Make Distcheck PASS 281.07 seconds Build w/ext ELL - Configure PASS 10.57 seconds Build w/ext ELL - Make PASS 1484.25 seconds Incremental Build with patchesPASS 0.00 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[BlueZ] gatt-db: Allow passing Characteristic Value to gatt_db_attribute_get_char_data
1: T1 Title exceeds max length (86>80): "[BlueZ] gatt-db: Allow passing Characteristic Value to gatt_db_attribute_get_char_data"
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 7 lines · On Wed, 11 May 2022 17:55:14 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This makes
gatt_db_attribute_get_char_datawork with Characteristic Value rather than only with Characteristic Declaration.--- src/shared/gatt-db.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
Here is the summary with links:
- [BlueZ] gatt-db: Allow passing Characteristic Value to gatt_db_attribute_get_char_data
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=83497bbb307f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html