diff options
Diffstat (limited to 'main/core_local.c')
| -rw-r--r-- | main/core_local.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/main/core_local.c b/main/core_local.c index 4a047032c..edf28399b 100644 --- a/main/core_local.c +++ b/main/core_local.c @@ -498,29 +498,32 @@ static void publish_local_bridge_message(struct local_pvt *p) RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); RAII_VAR(struct ast_channel_snapshot *, one_snapshot, NULL, ao2_cleanup); RAII_VAR(struct ast_channel_snapshot *, two_snapshot, NULL, ao2_cleanup); - SCOPED_AO2LOCK(lock, p); + struct ast_channel *owner; + struct ast_channel *chan; + + ast_unreal_lock_all(&p->base, &chan, &owner); blob = ast_json_pack("{s: s, s: s, s: b}", "context", p->context, "exten", p->exten, "can_optimize", !ast_test_flag(&p->base, AST_UNREAL_NO_OPTIMIZATION)); if (!blob) { - return; + goto end; } multi_blob = ast_multi_channel_blob_create(blob); if (!multi_blob) { - return; + goto end; } - one_snapshot = ast_channel_snapshot_create(p->base.owner); + one_snapshot = ast_channel_snapshot_create(owner); if (!one_snapshot) { - return; + goto end; } - two_snapshot = ast_channel_snapshot_create(p->base.chan); + two_snapshot = ast_channel_snapshot_create(chan); if (!two_snapshot) { - return; + goto end; } ast_multi_channel_blob_add_channel(multi_blob, "1", one_snapshot); @@ -528,10 +531,19 @@ static void publish_local_bridge_message(struct local_pvt *p) msg = stasis_message_create(ast_local_bridge_type(), multi_blob); if (!msg) { - return; + goto end; } - stasis_publish(ast_channel_topic(p->base.owner), msg); + stasis_publish(ast_channel_topic(owner), msg); + +end: + ast_channel_unlock(owner); + ast_channel_unref(owner); + + ast_channel_unlock(chan); + ast_channel_unref(chan); + + ao2_unlock(&p->base); } int ast_local_setup_bridge(struct ast_channel *ast, struct ast_bridge *bridge, struct ast_channel *swap, struct ast_bridge_features *features) |