Fixup fixup - add some debugging and error handling
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
8b1543974f
commit
26198e8826
1 changed files with 8 additions and 1 deletions
|
@ -2674,13 +2674,20 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame)
|
||||||
static int sip_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
|
static int sip_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
struct sip_pvt *p = newchan->tech_pvt;
|
struct sip_pvt *p;
|
||||||
|
|
||||||
|
if (!newchan || !newchan->tech_pvt) {
|
||||||
|
ast_log(LOG_WARNING, "No SIP tech_pvt! Fixup of %s failed.\n", oldchan->name);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
p = newchan->tech_pvt;
|
||||||
|
|
||||||
ast_mutex_lock(&p->lock);
|
ast_mutex_lock(&p->lock);
|
||||||
if (p->owner != oldchan)
|
if (p->owner != oldchan)
|
||||||
ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
|
ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
|
||||||
else {
|
else {
|
||||||
p->owner = newchan;
|
p->owner = newchan;
|
||||||
|
append_history(p, "Masq", "Old channel: %s\n", oldchan->name);
|
||||||
ret = 0;
|
ret = 0;
|
||||||
}
|
}
|
||||||
ast_mutex_unlock(&p->lock);
|
ast_mutex_unlock(&p->lock);
|
||||||
|
|
Loading…
Reference in a new issue