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.4@122259 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 18 insertions, 0 deletions

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 758f4117b..9e0e9a388 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1010,10 +1010,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;
 }
 
@@ -1050,10 +1059,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;
 }