diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-06-22 17:10:16 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-06-22 17:10:16 +0000 |
| commit | 5941d4d81924f9d8e847470693e8e4ebca8139a2 (patch) | |
| tree | 0830d3ef6f219893d390617876e4e374670b2fc3 /channels/chan_iax2.c | |
| parent | 46018d50321331c5d094a002f5f40540c8e7f052 (diff) | |
- move the increase of the use count to be after the possible failures
- if the pbx fails to start, set the owner channel of the pvt strucutre
to be NULL
- return immediately if the pbx fails to start so the loop to set all of
the variables from the "setvar" options aren't set as a bunch of global
variables instead
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c98514adc..48ac8e44b 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3307,20 +3307,20 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability) i->owner = tmp; i->capability = capability; ast_setstate(tmp, state); - ast_mutex_lock(&usecnt_lock); - usecnt++; - ast_mutex_unlock(&usecnt_lock); - ast_update_use_count(); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name); ast_hangup(tmp); - tmp = NULL; + i->owner = NULL; + return NULL; } } for (v = i->vars ; v ; v = v->next) pbx_builtin_setvar_helper(tmp,v->name,v->value); - + ast_mutex_lock(&usecnt_lock); + usecnt++; + ast_mutex_unlock(&usecnt_lock); + ast_update_use_count(); } return tmp; } |