From b5ac40e980bc51799e1d236baf66f31ab68a6876 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 19 May 2008 16:50:52 +0000 Subject: [PATCH] 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) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@117135 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_smdi.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/res/res_smdi.c b/res/res_smdi.c index 9315cf9732..b6a0b4593b 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -394,6 +394,19 @@ static void *smdi_message_wait(struct ast_smdi_interface *iface, int timeout, 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 @@ static void *smdi_message_wait(struct ast_smdi_interface *iface, int timeout, /* 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);