Create a broadcast source endpoint using only the local endpoint.
This removes the ambiguity when having registered a local
broadcast sink and fixes the situation when multiple remote
endpoints are created when discovering a broadcast source.
Claudia Draghicescu (2):
bap: Fix source+sink endpoint registration
bap: Fix source+sink endpoint registration
profiles/audio/bap.c | 27 ++++++++--------
src/shared/bap.c | 73 ++++++++++++++++++++++----------------------
src/shared/bap.h | 3 ++
3 files changed, 55 insertions(+), 48 deletions(-)
base-commit: 0c757e8eeef69ff2b1eefa59e590f171c9fe1c88
--
2.39.2
Fix the case when registering both sink and source endpoints,
the register endpoint method call results in 2 remote endpoints
for each scanned broadcast source.
Remove the need of a remote pac when creating a broadcast stream.
---
src/shared/bap.c | 73 ++++++++++++++++++++++++------------------------
src/shared/bap.h | 3 ++
2 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 925501c48..665cd76b0 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -644,7 +644,7 @@ static struct bt_bap_endpoint *bap_endpoint_new_broadcast(struct bt_bap_db *bdb,
if (type == BT_BAP_BCAST_SINK)
ep->dir = BT_BAP_BCAST_SOURCE;
else
- ep->dir = BT_BAP_BCAST_SINK;
+ ep->dir = 0;
return ep;
}
@@ -1500,12 +1500,12 @@ static void ep_config_cb(struct bt_bap_stream *stream, int err)
return;
if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST) {
- if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+ if (!bt_bap_stream_io_dir(stream))
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_QOS);
+ BT_BAP_STREAM_STATE_QOS);
else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_CONFIG);
+ BT_BAP_STREAM_STATE_CONFIG);
return;
}
@@ -2682,7 +2682,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
struct iovec *metadata)
{
struct bt_bap_db *bdb;
- struct bt_bap_pac *pac, *pac_broadcast_sink;
+ struct bt_bap_pac *pac;
struct bt_bap_codec codec;
if (!db)
@@ -2710,15 +2710,6 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
break;
case BT_BAP_BCAST_SOURCE:
bap_add_broadcast_source(pac);
- if (queue_isempty(bdb->broadcast_sinks)) {
- /* When adding a local broadcast source, add also a
- * local broadcast sink
- */
- pac_broadcast_sink = bap_pac_new(bdb, name,
- BT_BAP_BCAST_SINK, &codec, qos,
- data, metadata);
- bap_add_broadcast_sink(pac_broadcast_sink);
- }
break;
case BT_BAP_BCAST_SINK:
bap_add_broadcast_sink(pac);
@@ -4482,21 +4473,12 @@ void bt_bap_foreach_pac(struct bt_bap *bap, uint8_t type,
func, user_data);
case BT_BAP_SOURCE:
return bap_foreach_pac(bap->ldb->sinks, bap->rdb->sources,
- func, user_data);
+ func, user_data);
case BT_BAP_BCAST_SOURCE:
- if (queue_isempty(bap->rdb->broadcast_sources)
- && queue_isempty(bap->rdb->broadcast_sinks))
- return bap_foreach_pac(bap->ldb->broadcast_sources,
- bap->ldb->broadcast_sinks,
- func, user_data);
-
- return bap_foreach_pac(bap->ldb->broadcast_sinks,
- bap->rdb->broadcast_sources,
- func, user_data);
case BT_BAP_BCAST_SINK:
return bap_foreach_pac(bap->ldb->broadcast_sinks,
- bap->rdb->broadcast_sources,
- func, user_data);
+ bap->rdb->broadcast_sources,
+ func, user_data);
}
}
@@ -4541,6 +4523,20 @@ void *bt_bap_pac_get_user_data(struct bt_bap_pac *pac)
return pac->user_data;
}
+bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac)
+{
+ if (!bap->ldb)
+ return false;
+
+ if (queue_find(bap->ldb->broadcast_sinks, NULL, pac))
+ return true;
+
+ if (queue_find(bap->ldb->broadcast_sources, NULL, pac))
+ return true;
+
+ return false;
+}
+
static bool find_ep_unused(const void *data, const void *user_data)
{
const struct bt_bap_endpoint *ep = data;
@@ -4549,7 +4545,10 @@ static bool find_ep_unused(const void *data, const void *user_data)
if (ep->stream)
return false;
- return ep->dir == match->rpac->type;
+ if (match->rpac)
+ return ep->dir == match->rpac->type;
+ else
+ return true;
}
static bool find_ep_pacs(const void *data, const void *user_data)
@@ -4708,7 +4707,11 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
struct bt_bap_endpoint *ep;
struct match_pac match;
- if (!bap || !bap->rdb || queue_isempty(bap->remote_eps))
+ if (!bap)
+ return NULL;
+
+ if (!rpac && (lpac->type != BT_BAP_BCAST_SOURCE)
+ && queue_isempty(bap->remote_eps))
return NULL;
if (lpac && rpac) {
@@ -4745,7 +4748,9 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
return NULL;
bt_bap_foreach_pac(bap, type, match_pac, &match);
- if (!match.lpac || !match.rpac)
+ if (!match.lpac)
+ return NULL;
+ if (!match.rpac && (lpac->type != BT_BAP_BCAST_SOURCE))
return NULL;
lpac = match.lpac;
@@ -4927,12 +4932,12 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream,
queue_foreach(stream->links, bap_stream_enable_link, metadata);
break;
case BT_BAP_STREAM_TYPE_BCAST:
- if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+ if (!bt_bap_stream_io_dir(stream))
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_CONFIG);
+ BT_BAP_STREAM_STATE_CONFIG);
else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
stream_set_state_broadcast(stream,
- BT_BAP_STREAM_STATE_STREAMING);
+ BT_BAP_STREAM_STATE_STREAMING);
return 1;
}
@@ -5465,10 +5470,6 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name)
struct bt_bap_endpoint *ep;
struct bt_bap_pac *pac_broadcast_source;
- /* Add the remote source only if a local sink endpoint was registered */
- if (queue_isempty(bap->ldb->broadcast_sinks))
- return false;
-
/* Add the remote source only if a local sink endpoint was registered */
if (queue_isempty(bap->ldb->broadcast_sinks))
return false;
diff --git a/src/shared/bap.h b/src/shared/bap.h
index ebe4dbf7d..edc88c834 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -320,3 +320,6 @@ void bt_bap_update_bcast_source(struct bt_bap_pac *pac,
struct bt_bap_codec *codec,
struct iovec *data,
struct iovec *metadata);
+
+bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac);
+
--
2.39.2
Fix the case when registering both sink and source endpoints,
the register endpoint method call results in 2 remote endpoints
for each scanned broadcast source.
Remove the need of a remote pac when creating a broadcast stream.
---
profiles/audio/bap.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index fa5cf1f54..be30d0efd 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -1050,7 +1050,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
const char *suffix;
struct match_ep match = { lpac, rpac };
- switch (bt_bap_pac_get_type(rpac)) {
+ switch (bt_bap_pac_get_type(lpac)) {
case BT_BAP_BCAST_SOURCE:
case BT_BAP_BCAST_SINK:
queue = data->bcast;
@@ -1073,13 +1073,13 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
if (device)
ep->data->device = device;
- switch (bt_bap_pac_get_type(rpac)) {
- case BT_BAP_BCAST_SINK:
+ switch (bt_bap_pac_get_type(lpac)) {
+ case BT_BAP_BCAST_SOURCE:
err = asprintf(&ep->path, "%s/pac_%s%d",
adapter_get_path(adapter), suffix, i);
ep->base = new0(struct iovec, 1);
break;
- case BT_BAP_BCAST_SOURCE:
+ case BT_BAP_BCAST_SINK:
err = asprintf(&ep->path, "%s/pac_%s%d",
device_get_path(device), suffix, i);
ep->base = new0(struct iovec, 1);
@@ -1101,7 +1101,10 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
ep_free(ep);
return NULL;
}
- bt_bap_pac_set_user_data(rpac, ep->path);
+ if (rpac)
+ bt_bap_pac_set_user_data(rpac, ep->path);
+ else
+ bt_bap_pac_set_user_data(lpac, ep->path);
DBG("ep %p lpac %p rpac %p path %s", ep, ep->lpac, ep->rpac, ep->path);
@@ -1792,7 +1795,7 @@ static void bap_listen_io_broadcast(struct bap_data *data, struct bap_ep *ep,
error("%s", err->message);
g_error_free(err);
}
-
+ ep->io = io;
ep->data->listen_io = io;
}
@@ -1958,12 +1961,12 @@ static void pac_added_broadcast(struct bt_bap_pac *pac, void *user_data)
{
struct bap_data *data = user_data;
- if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE)
- bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SOURCE,
- pac_found_bcast, data);
- else if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SINK)
- bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SINK,
- pac_found_bcast, data);
+ if (bt_bap_pac_bcast_is_local(data->bap, pac) &&
+ (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE))
+ pac_found_bcast(pac, NULL, user_data);
+ else
+ bt_bap_foreach_pac(data->bap, bt_bap_pac_get_type(pac),
+ pac_found_bcast, data);
}
static bool ep_match_pac(const void *data, const void *match_data)
--
2.39.2
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=794752
---Test result---
Test Summary:
CheckPatch PASS 1.22 seconds
GitLint PASS 0.77 seconds
BuildEll PASS 37.73 seconds
BluezMake PASS 1274.12 seconds
MakeCheck PASS 14.15 seconds
MakeDistcheck PASS 238.31 seconds
CheckValgrind PASS 358.38 seconds
CheckSmatch PASS 495.67 seconds
bluezmakeextell PASS 158.29 seconds
IncrementalBuild PASS 2265.49 seconds
ScanBuild WARNING 1540.07 seconds
Details
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/bap.c:4753:23: warning: Access to field 'type' results in a dereference of a null pointer (loaded from variable 'lpac')
if (!match.rpac && (lpac->type != BT_BAP_BCAST_SOURCE))
^~~~~~~~~~
1 warning generated.
---
Regards,
Linux Bluetooth