kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging from 1.2, bug 5925 - app_voicemail should check for the callerid it sets for unknown

Browse Source 
Also, remove unnecessary res checks (initialized to 0; never set)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2005-12-03 20:20:51 +00:00
parent 870f98f02d
commit 357c38d177
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_voicemail.c
View File

@@ -3674,7 +3674,7 @@ static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms,
/* Strip off caller ID number from name */
ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
ast_callerid_parse(cid, &name, &callerid);
if ((!res)&&(!ast_strlen_zero(callerid))){
if ((!ast_strlen_zero(callerid)) && strcmp(callerid, "Unknown")) {
/* Check for internal contexts and only */
/* say extension when the call didn't come from an internal context in the list */
for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){
@@ -3714,8 +3714,7 @@ static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms,
} else {
/* Number unknown */
ast_log(LOG_DEBUG, "VM-CID: From an unknown number\n");
if (!res)
/* BB: Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
/* Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
res = wait_file2(chan, vms, "vm-unknown-caller");
}
return res;