kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

X out announce stuff (bug #760)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-01-15 20:20:21 +00:00
parent 94da5ac1e8
commit 036cb819d6
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/app_dial.c
View File

@@ -347,7 +347,6 @@ static int dial_exec(struct ast_channel *chan, void *data)
int privacy=0; int privacy=0;
int announce=0; int announce=0;
int resetcdr=0; int resetcdr=0;
int cnt=0;
char numsubst[AST_MAX_EXTENSION]; char numsubst[AST_MAX_EXTENSION];
char restofit[AST_MAX_EXTENSION]; char restofit[AST_MAX_EXTENSION];
char *transfer = NULL; char *transfer = NULL;
@@ -397,6 +396,24 @@ static int dial_exec(struct ast_channel *chan, void *data)
if (transfer) { if (transfer) {
/* XXX ANNOUNCE SUPPORT */
if ((ann = strstr(transfer, "A("))) {
announce = 1;
strncpy(announcemsg, ann + 2, sizeof(announcemsg) - 1);
/* Overwrite with X's what was the announce info */
while(*ann && (*ann != ')'))
*(ann++) = 'X';
if (*ann)
*ann = 'X';
/* Now find the end of the privdb */
ann = strchr(announcemsg, ')');
if (ann)
*ann = '\0';
else {
ast_log(LOG_WARNING, "Transfer with Announce spec lacking trailing ')'\n");
announce = 0;
}
}
/* Extract privacy info from transfer */ /* Extract privacy info from transfer */
if ((s = strstr(transfer, "P("))) { if ((s = strstr(transfer, "P("))) {
privacy = 1; privacy = 1;
@@ -411,7 +428,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
if (s) if (s)
*s = '\0'; *s = '\0';
else { else {
ast_log(LOG_WARNING, "Transfer with privacy lacking trailing '('\n"); ast_log(LOG_WARNING, "Transfer with privacy lacking trailing ')'\n");
privacy = 0; privacy = 0;
} }
} else if (strchr(transfer, 'P')) { } else if (strchr(transfer, 'P')) {
@@ -420,16 +437,6 @@ static int dial_exec(struct ast_channel *chan, void *data)
} else if (strchr(transfer, 'C')) { } else if (strchr(transfer, 'C')) {
resetcdr = 1; resetcdr = 1;
} }
/* XXX ANNOUNCE SUPPORT */
else if ((ann = strstr(transfer, "A("))) {
announce = 1;
strncpy(announcemsg, ann + 2, sizeof(announcemsg) - 1);
cnt=0;
while(announcemsg[cnt] != ')') {
cnt++;
}
announcemsg[cnt]='\0';
}
} }
if (resetcdr && chan->cdr) if (resetcdr && chan->cdr)
ast_cdr_reset(chan->cdr, 0); ast_cdr_reset(chan->cdr, 0);