kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some race conditions that cause ast_assert() to report that chan_iax2 tried

Browse Source 
to remove an entry that wasn't in the scheduler


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-06-12 18:22:44 +00:00
parent 0c0a5cdc73
commit 836d5c5afa
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_iax2.c
View File

@@ -1010,10 +1010,19 @@ static void __send_ping(const void *data)
static int 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 #ifdef SCHED_MULTITHREADED
if (schedule_action(__send_ping, data)) if (schedule_action(__send_ping, data))
#endif #endif
__send_ping(data); __send_ping(data);
return 0; return 0;
} }
@@ -1050,10 +1059,19 @@ static void __send_lagrq(const void *data)
static int 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 #ifdef SCHED_MULTITHREADED
if (schedule_action(__send_lagrq, data)) if (schedule_action(__send_lagrq, data))
#endif #endif
__send_lagrq(data); __send_lagrq(data);
return 0; return 0;
} }