From: Luiz Augusto von Dentz <[email protected]>
If request needs to be resend due to change in the security use the
chan->queue otherwise it may end up using a different channel.
---
src/shared/att.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/att.c b/src/shared/att.c
index f7bef08bc169..b90af93ccbf8 100644
--- a/src/shared/att.c
+++ b/src/shared/att.c
@@ -799,8 +799,8 @@ static bool handle_error_rsp(struct bt_att_chan *chan, uint8_t *pdu,
chan->pending_req = NULL;
- /* Push operation back to request queue */
- return queue_push_head(att->req_queue, op);
+ /* Push operation back to channel queue */
+ return queue_push_head(chan->queue, op);
}
static void handle_rsp(struct bt_att_chan *chan, uint8_t opcode, uint8_t *pdu,
--
2.37.3
From: Luiz Augusto von Dentz <[email protected]>
This makes gatt_db_attribute_write to accept NULL as a func when
storing directly on the db itself.
---
src/shared/gatt-db.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index ba47c75ff70c..9a92090ec493 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -2095,7 +2095,7 @@ bool gatt_db_attribute_write(struct gatt_db_attribute *attrib, uint16_t offset,
{
uint8_t err = 0;
- if (!attrib || !func)
+ if (!attrib || (!func && attrib->write_func))
return false;
if (attrib->write_func) {
@@ -2158,7 +2158,8 @@ bool gatt_db_attribute_write(struct gatt_db_attribute *attrib, uint16_t offset,
memcpy(&attrib->value[offset], value, len);
done:
- func(attrib, err, user_data);
+ if (func)
+ func(attrib, err, user_data);
return true;
}
--
2.37.3
From: Luiz Augusto von Dentz <[email protected]>
If PAC Sink/Source has been found but not record has been recovered it
means an error must have occured so this attempt to read the records
once again.
---
src/shared/bap.c | 146 +++++++++++++++++++++++++++--------------------
1 file changed, 83 insertions(+), 63 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 04ef4f44c1dd..391838a96c55 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -2837,69 +2837,6 @@ static void read_sink_pac(struct bt_bap *bap, bool success, uint8_t att_ecode,
bap_parse_pacs(bap, BT_BAP_SINK, bap->rdb->sinks, value, length);
}
-static void read_source_pac_loc(struct bt_bap *bap, bool success,
- uint8_t att_ecode, const uint8_t *value,
- uint16_t length, void *user_data)
-{
- struct bt_pacs *pacs = bap_get_pacs(bap);
-
- if (!success) {
- DBG(bap, "Unable to read Source PAC Location: error 0x%02x",
- att_ecode);
- return;
- }
-
- gatt_db_attribute_write(pacs->source_loc, 0, value, length, 0, NULL,
- NULL, NULL);
-}
-
-static void read_sink_pac_loc(struct bt_bap *bap, bool success,
- uint8_t att_ecode, const uint8_t *value,
- uint16_t length, void *user_data)
-{
- struct bt_pacs *pacs = bap_get_pacs(bap);
-
- if (!success) {
- DBG(bap, "Unable to read Sink PAC Location: error 0x%02x",
- att_ecode);
- return;
- }
-
- gatt_db_attribute_write(pacs->sink_loc, 0, value, length, 0, NULL,
- NULL, NULL);
-}
-
-static void read_pac_context(struct bt_bap *bap, bool success,
- uint8_t att_ecode, const uint8_t *value,
- uint16_t length, void *user_data)
-{
- struct bt_pacs *pacs = bap_get_pacs(bap);
-
- if (!success) {
- DBG(bap, "Unable to read PAC Context: error 0x%02x", att_ecode);
- return;
- }
-
- gatt_db_attribute_write(pacs->context, 0, value, length, 0, NULL,
- NULL, NULL);
-}
-
-static void read_pac_supported_context(struct bt_bap *bap, bool success,
- uint8_t att_ecode, const uint8_t *value,
- uint16_t length, void *user_data)
-{
- struct bt_pacs *pacs = bap_get_pacs(bap);
-
- if (!success) {
- DBG(bap, "Unable to read PAC Supproted Context: error 0x%02x",
- att_ecode);
- return;
- }
-
- gatt_db_attribute_write(pacs->supported_context, 0, value, length, 0,
- NULL, NULL, NULL);
-}
-
static void bap_pending_destroy(void *data)
{
struct bt_bap_pending *pending = data;
@@ -2944,6 +2881,89 @@ static void bap_read_value(struct bt_bap *bap, uint16_t value_handle,
queue_push_tail(bap->pending, pending);
}
+static void read_source_pac_loc(struct bt_bap *bap, bool success,
+ uint8_t att_ecode, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct bt_pacs *pacs = bap_get_pacs(bap);
+
+ if (!success) {
+ DBG(bap, "Unable to read Source PAC Location: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ gatt_db_attribute_write(pacs->source_loc, 0, value, length, 0, NULL,
+ NULL, NULL);
+
+ /* Resume reading sinks if supported but for some reason is empty */
+ if (pacs->source && queue_isempty(bap->rdb->sources)) {
+ uint16_t value_handle;
+
+ if (gatt_db_attribute_get_char_data(pacs->source,
+ NULL, &value_handle,
+ NULL, NULL, NULL))
+ bap_read_value(bap, value_handle, read_source_pac, bap);
+ }
+}
+
+static void read_sink_pac_loc(struct bt_bap *bap, bool success,
+ uint8_t att_ecode, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct bt_pacs *pacs = bap_get_pacs(bap);
+
+ if (!success) {
+ DBG(bap, "Unable to read Sink PAC Location: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ gatt_db_attribute_write(pacs->sink_loc, 0, value, length, 0, NULL,
+ NULL, NULL);
+
+ /* Resume reading sinks if supported but for some reason is empty */
+ if (pacs->sink && queue_isempty(bap->rdb->sinks)) {
+ uint16_t value_handle;
+
+ if (gatt_db_attribute_get_char_data(pacs->sink,
+ NULL, &value_handle,
+ NULL, NULL, NULL))
+ bap_read_value(bap, value_handle, read_sink_pac, bap);
+ }
+}
+
+static void read_pac_context(struct bt_bap *bap, bool success,
+ uint8_t att_ecode, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct bt_pacs *pacs = bap_get_pacs(bap);
+
+ if (!success) {
+ DBG(bap, "Unable to read PAC Context: error 0x%02x", att_ecode);
+ return;
+ }
+
+ gatt_db_attribute_write(pacs->context, 0, value, length, 0, NULL,
+ NULL, NULL);
+}
+
+static void read_pac_supported_context(struct bt_bap *bap, bool success,
+ uint8_t att_ecode, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct bt_pacs *pacs = bap_get_pacs(bap);
+
+ if (!success) {
+ DBG(bap, "Unable to read PAC Supproted Context: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ gatt_db_attribute_write(pacs->supported_context, 0, value, length, 0,
+ NULL, NULL, NULL);
+}
+
static void foreach_pacs_char(struct gatt_db_attribute *attr, void *user_data)
{
struct bt_bap *bap = user_data;
--
2.37.3
From: Luiz Augusto von Dentz <[email protected]>
This makes bt_bap_pac_register to be per session rather than global so
the callback don't have to match the session by itself.
---
profiles/audio/bap.c | 6 ++--
src/shared/bap.c | 66 +++++++++++++++++++++++++-------------------
src/shared/bap.h | 11 ++++----
3 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index f28843ae6b38..ae944b617bb4 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -120,7 +120,7 @@ static void bap_data_free(struct bap_data *data)
queue_destroy(data->streams, NULL);
bt_bap_ready_unregister(data->bap, data->ready_id);
bt_bap_state_unregister(data->bap, data->state_id);
- bt_bap_pac_unregister(data->pac_id);
+ bt_bap_pac_unregister(data->bap, data->pac_id);
bt_bap_unref(data->bap);
free(data);
}
@@ -1265,8 +1265,8 @@ static int bap_probe(struct btd_service *service)
NULL);
data->state_id = bt_bap_state_register(data->bap, bap_state,
bap_connecting, data, NULL);
- data->pac_id = bt_bap_pac_register(pac_added, pac_removed, service,
- NULL);
+ data->pac_id = bt_bap_pac_register(data->bap, pac_added, pac_removed,
+ service, NULL);
bt_bap_set_user_data(data->bap, service);
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 391838a96c55..2919f243f78a 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -47,6 +47,7 @@
#define BAP_PROCESS_TIMEOUT 10
struct bt_bap_pac_changed {
+ unsigned int id;
bt_bap_pac_func_t added;
bt_bap_pac_func_t removed;
bt_bap_destroy_func_t destroy;
@@ -165,6 +166,7 @@ struct bt_bap {
struct queue *notify;
struct queue *streams;
+ struct queue *pac_cbs;
struct queue *ready_cbs;
struct queue *state_cbs;
@@ -250,7 +252,6 @@ struct bt_pacs_context {
/* Contains local bt_bap_db */
static struct queue *bap_db;
-static struct queue *pac_cbs;
static struct queue *bap_cbs;
static struct queue *sessions;
@@ -268,24 +269,26 @@ static void *iov_append(struct iovec *iov, size_t len, const void *d)
return util_iov_push_mem(iov, len, d);
}
-unsigned int bt_bap_pac_register(bt_bap_pac_func_t added,
+unsigned int bt_bap_pac_register(struct bt_bap *bap, bt_bap_pac_func_t added,
bt_bap_pac_func_t removed, void *user_data,
bt_bap_destroy_func_t destroy)
{
struct bt_bap_pac_changed *changed;
+ static unsigned int id;
+
+ if (!bap)
+ return 0;
changed = new0(struct bt_bap_pac_changed, 1);
+ changed->id = ++id ? id : ++id;
changed->added = added;
changed->removed = removed;
changed->destroy = destroy;
changed->data = user_data;
- if (!pac_cbs)
- pac_cbs = queue_new();
+ queue_push_tail(bap->pac_cbs, changed);
- queue_push_tail(pac_cbs, changed);
-
- return queue_length(pac_cbs);
+ return changed->id;
}
static void pac_changed_free(void *data)
@@ -298,39 +301,28 @@ static void pac_changed_free(void *data)
free(changed);
}
-struct match_pac_id {
- unsigned int id;
- unsigned int index;
-};
-
-static bool match_index(const void *data, const void *match_data)
+static bool match_pac_changed_id(const void *data, const void *match_data)
{
- struct match_pac_id *match = (void *)match_data;
+ const struct bt_bap_pac_changed *changed = data;
+ unsigned int id = PTR_TO_UINT(match_data);
- match->index++;
-
- return match->id == match->index;
+ return (changed->id == id);
}
-bool bt_bap_pac_unregister(unsigned int id)
+bool bt_bap_pac_unregister(struct bt_bap *bap, unsigned int id)
{
struct bt_bap_pac_changed *changed;
- struct match_pac_id match;
- memset(&match, 0, sizeof(match));
- match.id = id;
+ if (!bap)
+ return false;
- changed = queue_remove_if(pac_cbs, match_index, &match);
+ changed = queue_remove_if(bap->pac_cbs, match_pac_changed_id,
+ UINT_TO_PTR(id));
if (!changed)
return false;
pac_changed_free(changed);
- if (queue_isempty(pac_cbs)) {
- queue_destroy(pac_cbs, NULL);
- pac_cbs = NULL;
- }
-
return true;
}
@@ -2366,6 +2358,13 @@ static void notify_pac_added(void *data, void *user_data)
changed->added(pac, changed->data);
}
+static void notify_session_pac_added(void *data, void *user_data)
+{
+ struct bt_bap *bap = data;
+
+ queue_foreach(bap->pac_cbs, notify_pac_added, user_data);
+}
+
struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
const char *name, uint8_t type,
uint8_t id, uint16_t cid, uint16_t vid,
@@ -2402,7 +2401,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
return NULL;
}
- queue_foreach(pac_cbs, notify_pac_added, pac);
+ queue_foreach(sessions, notify_session_pac_added, pac);
return pac;
}
@@ -2434,6 +2433,13 @@ static void notify_pac_removed(void *data, void *user_data)
changed->removed(pac, changed->data);
}
+static void notify_session_pac_removed(void *data, void *user_data)
+{
+ struct bt_bap *bap = data;
+
+ queue_foreach(bap->pac_cbs, notify_pac_removed, user_data);
+}
+
bool bt_bap_pac_set_ops(struct bt_bap_pac *pac, struct bt_bap_pac_ops *ops,
void *user_data)
{
@@ -2480,7 +2486,7 @@ bool bt_bap_remove_pac(struct bt_bap_pac *pac)
found:
queue_foreach(sessions, remove_streams, pac);
- queue_foreach(pac_cbs, notify_pac_removed, pac);
+ queue_foreach(sessions, notify_session_pac_removed, pac);
bap_pac_free(pac);
return true;
}
@@ -2552,6 +2558,7 @@ static void bap_free(void *data)
bap_db_free(bap->rdb);
+ queue_destroy(bap->pac_cbs, pac_changed_free);
queue_destroy(bap->ready_cbs, bap_ready_free);
queue_destroy(bap->state_cbs, bap_state_free);
@@ -2632,6 +2639,7 @@ struct bt_bap *bt_bap_new(struct gatt_db *ldb, struct gatt_db *rdb)
bap->reqs = queue_new();
bap->pending = queue_new();
bap->notify = queue_new();
+ bap->pac_cbs = queue_new();
bap->ready_cbs = queue_new();
bap->streams = queue_new();
bap->state_cbs = queue_new();
diff --git a/src/shared/bap.h b/src/shared/bap.h
index 7b9f88c8320c..3558d0445486 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -87,12 +87,6 @@ typedef void (*bt_bap_stream_func_t)(struct bt_bap_stream *stream,
typedef void (*bt_bap_func_t)(struct bt_bap *bap, void *user_data);
/* Local PAC related functions */
-
-unsigned int bt_bap_pac_register(bt_bap_pac_func_t added,
- bt_bap_pac_func_t removed, void *user_data,
- bt_bap_destroy_func_t destroy);
-bool bt_bap_pac_unregister(unsigned int id);
-
struct bt_bap_pac_qos {
uint8_t framing;
uint8_t phy;
@@ -161,6 +155,11 @@ bool bt_bap_set_debug(struct bt_bap *bap, bt_bap_debug_func_t cb,
bool bap_print_cc(void *data, size_t len, util_debug_func_t func,
void *user_data);
+unsigned int bt_bap_pac_register(struct bt_bap *bap, bt_bap_pac_func_t added,
+ bt_bap_pac_func_t removed, void *user_data,
+ bt_bap_destroy_func_t destroy);
+bool bt_bap_pac_unregister(struct bt_bap *bap, unsigned int id);
+
unsigned int bt_bap_ready_register(struct bt_bap *bap,
bt_bap_ready_func_t func, void *user_data,
bt_bap_destroy_func_t destroy);
--
2.37.3
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=703146
---Test result---
Test Summary:
CheckPatch FAIL 2.52 seconds
GitLint PASS 1.41 seconds
BuildEll PASS 27.40 seconds
BluezMake PASS 1009.44 seconds
MakeCheck PASS 11.49 seconds
MakeDistcheck PASS 149.64 seconds
CheckValgrind PASS 248.26 seconds
bluezmakeextell PASS 97.45 seconds
IncrementalBuild PASS 4456.90 seconds
ScanBuild PASS 1048.52 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,3/5] shared/bap: Read PAC Sink/Source if respective location is found
WARNING:TYPO_SPELLING: 'occured' may be misspelled - perhaps 'occurred'?
#86:
means an error must have occured so this attempt to read the records
^^^^^^^
/github/workspace/src/src/13069110.patch total: 0 errors, 1 warnings, 158 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13069110.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth
Hello:
This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Thu, 8 Dec 2022 17:03:10 -0800 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> If request needs to be resend due to change in the security use the
> chan->queue otherwise it may end up using a different channel.
> ---
> src/shared/att.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Here is the summary with links:
- [BlueZ,1/5] shared/att: Fix not requeueing in the same channel
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=f8670f9aa0a0
- [BlueZ,2/5] shared/bap: Log error message if request cannot be sent
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=6b5b51392312
- [BlueZ,3/5] shared/bap: Read PAC Sink/Source if respective location is found
(no matching commit)
- [BlueZ,4/5] shared/gatt-db: Allow passing NULL to gatt_db_attribute_write
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=be9fc9222c03
- [BlueZ,5/5] shared/bap: Make bt_bap_pac_register to be per session
(no matching commit)
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html