diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-28 16:10:48 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-28 16:10:48 +0000 |
commit | 145b9824349f0c6011ff273935ce7386634ed771 (patch) | |
tree | 3fc41165baa40f86264132fe11f6aa7c41bae0df | |
parent | 6c25f36eb75265c539ada426e2983d776564a964 (diff) |
merge revision 118702 from trunk to 1.4 -- Fixes a bug in chan_iax that uses send_command to poke a peer while a channel is unlocked in some cases, and because it can cause seemingly random failures could be related to some bugs in the tracker...
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@118716 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 67bfff42c..439177771 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8878,7 +8878,11 @@ static int iax2_poke_peer(struct iax2_peer *peer, int heldcall) peer_unref(peer); /* And send the poke */ - send_command(iaxs[peer->callno], AST_FRAME_IAX, IAX_COMMAND_POKE, 0, NULL, 0, -1); + ast_mutex_lock(&iaxsl[peer->callno]); + if (iaxs[peer->callno]) { + send_command(iaxs[peer->callno], AST_FRAME_IAX, IAX_COMMAND_POKE, 0, NULL, 0, -1); + } + ast_mutex_unlock(&iaxsl[peer->callno]); return 0; } |