diff options
| author | Alec L Davis <sivad.a@paradise.net.nz> | 2013-06-10 07:35:06 +0000 |
|---|---|---|
| committer | Alec L Davis <sivad.a@paradise.net.nz> | 2013-06-10 07:35:06 +0000 |
| commit | 1c8c91b63a0992be6629c1b0324f434cccf3ae5c (patch) | |
| tree | d6c0759dff431e52b3e47bbcd6be381bfef5323f /channels/chan_iax2.c | |
| parent | cfa94a99745b78e7f6ca5d4dba6579151a0aa922 (diff) | |
IAX2: fix race condition with nativebridge transfers.
1). When touching the bridgecallno, we need to lock it.
2). stop_stuff() which calls iax2_destroy_helper()
Assumes the lock on the pvt is already held, when iax2_destroy_helper() is called.
Thus we need to lock the bridgecallno pvt before we call stop_stuff(iaxs[fr->callno]->bridgecallno);
3). When evaluating the state of 'callno->transferring' of the current leg,
we can't change it to READY unless the bridgecallno is locked.
Why, if we are interrupted by the other call leg before 'transferring = TRANSFER_RELEASED',
the interrupt will find that it is READY and that the bridgecallno is also READY so Releases the legs.
(closes issue ASTERISK-21409)
Reported by: alecdavis
Tested by: alecdavis
alecdavis (license 585)
Review https://reviewboard.asterisk.org/r/2594/
........
Merged revisions 391062 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 391063 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 6f1aec018..8fe51b457 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -11215,6 +11215,15 @@ immediatedial: } break; case IAX_COMMAND_TXREADY: + if (iaxs[fr->callno]->bridgecallno) { + while (ast_mutex_trylock(&iaxsl[iaxs[fr->callno]->bridgecallno])) { + DEADLOCK_AVOIDANCE(&iaxsl[fr->callno]); + } + if (!iaxs[fr->callno]) { + break; + } + } + if ((iaxs[fr->callno]->transferring == TRANSFER_BEGIN) || (iaxs[fr->callno]->transferring == TRANSFER_MBEGIN)) { if (iaxs[fr->callno]->transferring == TRANSFER_MBEGIN) @@ -11263,6 +11272,9 @@ immediatedial: } } } + if (iaxs[fr->callno]->bridgecallno) { + ast_mutex_unlock(&iaxsl[iaxs[fr->callno]->bridgecallno]); + } break; case IAX_COMMAND_TXREQ: try_transfer(iaxs[fr->callno], &ies); |