Never release lock when doing a hangup or bad things can happen when masq is taking place
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1296 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
7fa4d658e3
commit
50af63e1d2
|
@ -1873,7 +1873,7 @@ static int ast_do_masquerade(struct ast_channel *original)
|
|||
/* We need the clone's lock, too */
|
||||
ast_pthread_mutex_lock(&clone->lock);
|
||||
|
||||
ast_log(LOG_DEBUG, "Got clone lock on '%s'\n", clone->name);
|
||||
ast_log(LOG_DEBUG, "Got clone lock on '%s' at %p\n", clone->name, &clone->lock);
|
||||
|
||||
/* Having remembered the original read/write formats, we turn off any translation on either
|
||||
one */
|
||||
|
|
|
@ -297,7 +297,7 @@ static int local_hangup(struct ast_channel *ast)
|
|||
/* Need to actually hangup since there is no PBX */
|
||||
ochan = p->chan;
|
||||
else
|
||||
local_queue_frame(p, isoutbound, &f, ast);
|
||||
local_queue_frame(p, isoutbound, &f, NULL);
|
||||
ast_pthread_mutex_unlock(&p->lock);
|
||||
if (ochan)
|
||||
ast_hangup(ochan);
|
||||
|
|
Loading…
Reference in New Issue