[asterisk-commits] russell: branch russell/sla_updates r56210 - in /team/russell/sla_updates: ap...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Feb 22 11:58:26 2007
New Revision: 56210

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56210
Log:
Fix a deadlock

Modified:
    team/russell/sla_updates/apps/app_meetme.c
    team/russell/sla_updates/main/dial.c

Modified: team/russell/sla_updates/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/apps/app_meetme.c?view=diff&rev=56210&r1=56209&r2=56210
==============================================================================
--- team/russell/sla_updates/apps/app_meetme.c (original)
+++ team/russell/sla_updates/apps/app_meetme.c Thu Feb 22 11:58:26 2007
@@ -3797,8 +3797,9 @@
 
 	ast_mutex_lock(&sla.lock);
 	AST_LIST_INSERT_HEAD(&sla.ringing_trunks, ringing_trunk, entry);
+	ast_mutex_unlock(&sla.lock);
+
 	sla_queue_event(SLA_EVENT_RINGING_TRUNK);
-	ast_mutex_unlock(&sla.lock);
 
 	return ringing_trunk;
 }

Modified: team/russell/sla_updates/main/dial.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/main/dial.c?view=diff&rev=56210&r1=56209&r2=56210
==============================================================================
--- team/russell/sla_updates/main/dial.c (original)
+++ team/russell/sla_updates/main/dial.c Thu Feb 22 11:58:26 2007
@@ -559,7 +559,7 @@
 
 	/* If we are running async spawn a thread and send it away... otherwise block here */
 	if (async) {
-		set_state(dial, AST_DIAL_RESULT_TRYING);
+		dial->state = AST_DIAL_RESULT_TRYING;
 		/* Try to create a thread */
 		if (ast_pthread_create(&dial->thread, NULL, async_dial, dial)) {
 			/* Failed to create the thread - hangup all dialed channels and return failed */