From 16fdb11bc3bb23a2fd645a24a7ba56d9708960ff Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 8 Feb 2017 14:27:18 -0600 Subject: core: Cleanup some channel snapshot staging anomalies. 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 --- apps/app_dial.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'apps/app_dial.c') diff --git a/apps/app_dial.c b/apps/app_dial.c index 2f5935d19..1cb91811f 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2541,16 +2541,14 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast continue; } - ast_channel_lock(tc); - ast_channel_stage_snapshot(tc); - ast_channel_unlock(tc); - ast_channel_get_device_name(tc, device_name, sizeof(device_name)); if (!ignore_cc) { ast_cc_extension_monitor_add_dialstring(chan, tmp->interface, device_name); } ast_channel_lock_both(tc, chan); + ast_channel_stage_snapshot(tc); + pbx_builtin_setvar_helper(tc, "DIALEDPEERNUMBER", tmp->number); /* Setup outgoing SDP to match incoming one */ @@ -2566,7 +2564,6 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast ast_channel_appl_set(tc, "AppDial"); ast_channel_data_set(tc, "(Outgoing Line)"); - ast_channel_publish_snapshot(tc); memset(ast_channel_whentohangup(tc), 0, sizeof(*ast_channel_whentohangup(tc))); @@ -2791,15 +2788,14 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast } } else { const char *number; + const char *name; int dial_end_raised = 0; int cause = -1; - if (ast_test_flag64(&opts, OPT_CALLER_ANSWER)) + if (ast_test_flag64(&opts, OPT_CALLER_ANSWER)) { ast_answer(chan); + } - strcpy(pa.status, "ANSWER"); - ast_channel_stage_snapshot(chan); - pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status); /* Ah ha! Someone answered within the desired timeframe. Of course after this we will always return with -1 so that it is hung up properly after the conversation. */ @@ -2821,10 +2817,10 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast hanguptree(&out_chans, peer, cause >= 0 ? cause : AST_CAUSE_ANSWERED_ELSEWHERE); /* If appropriate, log that we have a destination channel and set the answer time */ - if (ast_channel_name(peer)) - pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", ast_channel_name(peer)); ast_channel_lock(peer); + name = ast_strdupa(ast_channel_name(peer)); + number = pbx_builtin_getvar_helper(peer, "DIALEDPEERNUMBER"); if (ast_strlen_zero(number)) { number = NULL; @@ -2832,8 +2828,16 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast number = ast_strdupa(number); } ast_channel_unlock(peer); + ast_channel_lock(chan); + ast_channel_stage_snapshot(chan); + + strcpy(pa.status, "ANSWER"); + pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status); + + pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", name); pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", number); + ast_channel_stage_snapshot_done(chan); ast_channel_unlock(chan); -- cgit v1.2.3