kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve a crash in res_smdi when used with chan_dahdi.

Browse Source 
When chan_dahdi goes to get an SMDI message, it provides no search criteria.
It just grabs the next message that arrives.  This code was written with the
SMDI dialplan functions in mind, since that is now the preferred method of
using SMDI.  However, this broke support of it being used from chan_dahdi.

(closes AST-212)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@190661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-04-27 19:00:54 +00:00
parent 03eb22fe76
commit 8798a0f9dd
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/res_smdi.c
View File

@@ -383,7 +383,18 @@ static void *smdi_msg_find(struct ast_smdi_interface *iface,
switch (type) {
case SMDI_MD:
if (ast_test_flag(&options, OPT_SEARCH_TERMINAL)) {
if (ast_strlen_zero(search_key)) {
struct ast_smdi_md_message *md_msg = NULL;
/* No search key provided (the code from chan_dahdi does this).
* Just pop the top message off of the queue. */
ASTOBJ_CONTAINER_TRAVERSE(&iface->md_q, !md_msg, do {
md_msg = ASTOBJ_REF(iterator);
} while (0); );
msg = md_msg;
} else if (ast_test_flag(&options, OPT_SEARCH_TERMINAL)) {
struct ast_smdi_md_message *md_msg = NULL;
/* Searching by the message desk terminal */
@@ -411,7 +422,20 @@ static void *smdi_msg_find(struct ast_smdi_interface *iface,
}
break;
case SMDI_MWI:
msg = ASTOBJ_CONTAINER_FIND(&iface->mwi_q, search_key);
if (ast_strlen_zero(search_key)) {
msg = ASTOBJ_CONTAINER_FIND(&iface->mwi_q, search_key);
} else {
struct ast_smdi_mwi_message *mwi_msg = NULL;
/* No search key provided (the code from chan_dahdi does this).
* Just pop the top message off of the queue. */
ASTOBJ_CONTAINER_TRAVERSE(&iface->mwi_q, !mwi_msg, do {
mwi_msg = ASTOBJ_REF(iterator);
} while (0); );
msg = mwi_msg;
}
break;
}