diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 18:23:54 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 18:23:54 +0000 |
| commit | a7ac808e458e4d587e70e0485d031bd01b9afccc (patch) | |
| tree | 9aca39701d8f39b18366553cc091fa3820ca29e5 /channels | |
| parent | f3fb6e3bb806115196d0da8fae58e36c8071d2f0 (diff) | |
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/trunk@122262 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 3ff7a256a..6648c8868 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1161,10 +1161,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; } @@ -1201,10 +1210,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; } |