[svn-commits] file: branch 1.4 r117135 - /branches/1.4/res/res_smdi.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon May 19 11:50:52 2008
New Revision: 117135

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117135
Log:
Use the right pthread lock and condition when waiting.
(closes issue #12664)
Reported by: tomo1657
Patches:
      res_smdi.c.patch uploaded by tomo1657 (license 484)

Modified:
    branches/1.4/res/res_smdi.c

Modified: branches/1.4/res/res_smdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_smdi.c?view=diff&rev=117135&r1=117134&r2=117135
==============================================================================
--- branches/1.4/res/res_smdi.c (original)
+++ branches/1.4/res/res_smdi.c Mon May 19 11:50:52 2008
@@ -394,6 +394,19 @@
 	struct timeval start;
 	long diff = 0;
 	void *msg;
+	ast_cond_t *cond = NULL;
+	ast_mutex_t *lock = NULL;
+
+	switch (type) {
+	case SMDI_MWI:
+		cond = &iface->mwi_q_cond;
+		lock = &iface->mwi_q_lock;
+		break;
+	case SMDI_MD:
+		cond = &iface->md_q_cond;
+		lock = &iface->md_q_lock;
+		break;
+	}
 
 	start = ast_tvnow();
 	while (diff < timeout) {
@@ -414,7 +427,7 @@
 		/* If there were no messages in the queue, then go to sleep until one
 		 * arrives. */
 
-		ast_cond_timedwait(&iface->md_q_cond, &iface->md_q_lock, &ts);
+		ast_cond_timedwait(cond, lock, &ts);
 
 		if ((msg = smdi_msg_find(iface, type, station))) {
 			unlock_msg_q(iface, type);