[svn-commits] russell: branch russell/smdi-1.4 r103724 - /team/russell/smdi-1.4/res/res_smdi.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Feb 15 11:29:08 2008
New Revision: 103724

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103724
Log:
merge a couple bug fixes made in the upenn branch

Modified:
    team/russell/smdi-1.4/res/res_smdi.c

Modified: team/russell/smdi-1.4/res/res_smdi.c
URL: http://svn.digium.com/view/asterisk/team/russell/smdi-1.4/res/res_smdi.c?view=diff&rev=103724&r1=103723&r2=103724
==============================================================================
--- team/russell/smdi-1.4/res/res_smdi.c (original)
+++ team/russell/smdi-1.4/res/res_smdi.c Fri Feb 15 11:29:08 2008
@@ -186,7 +186,7 @@
 {
 	ast_mutex_lock(&iface->mwi_q_lock);
 	ASTOBJ_CONTAINER_LINK_END(&iface->mwi_q, mwi_msg);
-	ast_cond_broadcast(&iface->md_q_cond);
+	ast_cond_broadcast(&iface->mwi_q_cond);
 	ast_mutex_unlock(&iface->mwi_q_lock);
 }
 
@@ -414,7 +414,7 @@
 		/* If there were no messages in the queue, then go to sleep until one
 		 * arrives. */
 
-		ast_cond_wait(&iface->md_q_cond, &iface->md_q_lock);
+		ast_cond_timedwait(&iface->md_q_cond, &iface->md_q_lock, &ts);
 
 		if ((msg = smdi_msg_find(iface, type, station))) {
 			unlock_msg_q(iface, type);