diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 18:24:33 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 18:24:33 +0000 |
commit | f188aacf466bb06a395397e16b0e67fb6e78ab72 (patch) | |
tree | 7dc4edd628830ffccff9370a05dfa8177d842b1e /channels/chan_iax2.c | |
parent | 5da62682d47dd522d5072064db9a066f38079f8e (diff) |
Merged revisions 122262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r122262 | russell | 2008-06-12 13:23:54 -0500 (Thu, 12 Jun 2008) | 11 lines
Merged revisions 122259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122259 | russell | 2008-06-12 13:22:44 -0500 (Thu, 12 Jun 2008) | 3 lines
Fix some race conditions that cause ast_assert() to report that chan_iax2 tried
to remove an entry that wasn't in the scheduler
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122266 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r-- | channels/chan_iax2.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e3e6c3074..5a1a5ea5f 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1150,10 +1150,19 @@ static void __send_ping(const void *data) static int send_ping(const void *data) { + int callno = (long) data; + + ast_mutex_lock(&iaxsl[callno]); + if (iaxs[callno]) { + iaxs[callno]->pingid = -1; + } + ast_mutex_unlock(&iaxsl[callno]); + #ifdef SCHED_MULTITHREADED if (schedule_action(__send_ping, data)) #endif __send_ping(data); + return 0; } @@ -1190,10 +1199,19 @@ static void __send_lagrq(const void *data) static int send_lagrq(const void *data) { + int callno = (long) data; + + ast_mutex_lock(&iaxsl[callno]); + if (iaxs[callno]) { + iaxs[callno]->lagid = -1; + } + ast_mutex_unlock(&iaxsl[callno]); + #ifdef SCHED_MULTITHREADED if (schedule_action(__send_lagrq, data)) #endif __send_lagrq(data); + return 0; } |