kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Cleanup some channel snapshot staging anomalies.

Browse Source 
We shouldn't unlock the channel after starting a snapshot staging because
another thread may interfere and do its own snapshot staging.

* app_dial.c:dial_exec_full() made hold the channel lock while setting up
the outgoing channel staging.  Made hold the channel lock after the called
party answers while updating the caller channel staging.

* chan_sip.c:sip_new() completed the channel staging on off-nominal exit.
Also we need to use ast_hangup() instead of ast_channel_unref() at that
location.

* channel.c:__ast_channel_alloc_ap() added a comment about not needing to
complete the channel snapshot staging on off-nominal exit paths.

* rtp_engine.c:ast_rtp_instance_set_stats_vars() made hold the channel
locks while staging the channels for the stats channel variables.

Change-Id: Iefb6336893163f6447bad65568722ad5d5d8212a
This commit is contained in:
Richard Mudgett
2017-02-08 14:27:18 -06:00
parent 46147a8f30
commit 16fdb11bc3
4 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
View File

@@ -8141,7 +8141,9 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
if (!fmt) {
ast_log(LOG_WARNING, "No compatible formats could be found for %s\n", ast_channel_name(tmp));
ao2_ref(caps, -1);
tmp = ast_channel_unref(tmp);
ast_channel_stage_snapshot_done(tmp);
ast_channel_unlock(tmp);
ast_hangup(tmp);
return NULL;
}
}