sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "chan_sip.c: Made sip_reinvite_retry() call sip_pvt_lock_full()."

This commit is contained in:
Joshua Colp 2016-03-17 11:19:22 -05:00 committed by Gerrit Code Review
parent 810f92c9dc 8be01398d9
commit 7d63b4499e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@ -23278,18 +23278,14 @@ static int sip_reinvite_retry(const void *data)
struct sip_pvt *p = (struct sip_pvt *) data;
struct ast_channel *owner;
sip_pvt_lock(p); /* called from schedule thread which requires a lock */
while ((owner = p->owner) && ast_channel_trylock(owner)) {
sip_pvt_unlock(p);
usleep(1);
sip_pvt_lock(p);
}
owner = sip_pvt_lock_full(p);
ast_set_flag(&p->flags[0], SIP_NEEDREINVITE);
p->waitid = -1;
check_pendings(p);
sip_pvt_unlock(p);
if (owner) {
ast_channel_unlock(owner);
ast_channel_unref(owner);
}
dialog_unref(p, "Schedule waitid complete");
return 0;