Skip to content

res_stasis/resource_bridges: Split bridge playback control and wrapper cleanup#1876

Merged
github-actions[bot] merged 1 commit intoasterisk:masterfrom
pekkaar:master-issue-1861
May 7, 2026
Merged

res_stasis/resource_bridges: Split bridge playback control and wrapper cleanup#1876
github-actions[bot] merged 1 commit intoasterisk:masterfrom
pekkaar:master-issue-1861

Conversation

@pekkaar
Copy link
Copy Markdown
Contributor

@pekkaar pekkaar commented Apr 17, 2026

Modified the bridge playback teardown so the worker thread removes only the
playback control, while the after-bridge callback removes the playback
wrapper once the announcer has actually left the bridge.

This avoids a stale window where a new playback request could create a
replacement announcer before the old announcer had fully exited the holding
bridge.

Also replaced the flexible trailing bridge_id storage in the shared worker
thread data with an optional bridge_id pointer, since recording paths use the
same structure without a bridge id.

Fixes: #1861

…r cleanup

Modified the bridge playback teardown so the worker thread removes only the
playback control, while the after-bridge callback removes the playback
wrapper once the announcer has actually left the bridge.

This avoids a stale window where a new playback request could create a
replacement announcer before the old announcer had fully exited the holding
bridge.

Also replaced the flexible trailing bridge_id storage in the shared worker
thread data with an optional bridge_id pointer, since recording paths use the
same structure without a bridge id.

Fixes: asterisk#1861
@pekkaar
Copy link
Copy Markdown
Contributor Author

pekkaar commented Apr 17, 2026

cherry-pick-to: 23
cherry-pick-to: 22
cherry-pick-to: 20

@github-actions
Copy link
Copy Markdown

Workflow Check completed successfully

@gtjoseph gtjoseph added the cherry-pick-test Trigger dry run of cherry-picks label May 7, 2026
@github-actions github-actions Bot added cherry-pick-testing-in-progress Cherry-Pick tests in progress cherry-pick-checks-failed Cherry-Pick checks failed and removed cherry-pick-test Trigger dry run of cherry-picks cherry-pick-testing-in-progress Cherry-Pick tests in progress labels May 7, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 7, 2026

Workflow CPCheck failed
20-ari1: FAILED TEST: rest_api/external_interaction/attended_transfer/stasis_bridge_to_stasis_app
22-pjs5: FAILED TEST: channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched

@pkrall-buzzeasy
Copy link
Copy Markdown

pkrall-buzzeasy commented May 7, 2026

Reviewed both CPCheck artifacts. The 20-ari1 failure is a SIPp referee.xml abort in an attended-transfer test, while the direct bridge playback tests that more closely relate to my commit still pass. The 22-pjs5 failure is an RLS/MWI validation failure, which is in a different subsystem from this ARI/stasis bridge playback change.

@gtjoseph
Copy link
Copy Markdown
Member

gtjoseph commented May 7, 2026

Yeah, the transfer and mwi tests are timing sensitive and can have issues if GitHub's runners are slow.

@github-actions github-actions Bot merged commit 176ecda into asterisk:master May 7, 2026
84 of 86 checks passed
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 7, 2026

Successfully merged to branch master and cherry-picked to ["23","22","20"]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[bug]: Possible heap corruption in audiohook/translate write path during bridged media

4 participants