kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't send redirecting updates to the caller if the dialplan forked the call.

Browse Source 
Each fork in the dial could be redirected and confuse the caller.  For
ISDN the DivLeg1 and DivLeg3 messages would get confused because ISDN
redirects calls in sequence not in parallel.

* Also fixed a formatting inconsistency in app_dial.c and make a warning
message more useful about what frame type could not be written.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@306324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-02-04 18:53:06 +00:00
parent 6bb8cc3a9b
commit cee1db213b
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/app_dial.c
View File

@@ -1276,7 +1276,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
case AST_CONTROL_REDIRECTING:
if (ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE)) {
ast_verb(3, "Redirecting update to %s prevented.\n", in->name);
} else {
} else if (single) {
ast_verb(3, "%s redirecting info has changed, passing it to %s\n", c->name, in->name);
if (ast_channel_redirecting_macro(c, in, f, 1, 1)) {
ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);
@@ -1321,20 +1321,22 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
}
} else if (single) {
switch (f->frametype) {
case AST_FRAME_VOICE:
case AST_FRAME_IMAGE:
case AST_FRAME_TEXT:
if (ast_write(in, f)) {
ast_log(LOG_WARNING, "Unable to write frame\n");
}
break;
case AST_FRAME_HTML:
if (!ast_test_flag64(outgoing, DIAL_NOFORWARDHTML) && ast_channel_sendhtml(in, f->subclass.integer, f->data.ptr, f->datalen) == -1) {
ast_log(LOG_WARNING, "Unable to send URL\n");
}
break;
default:
break;
case AST_FRAME_VOICE:
case AST_FRAME_IMAGE:
case AST_FRAME_TEXT:
if (ast_write(in, f)) {
ast_log(LOG_WARNING, "Unable to write frametype: %d\n",
f->frametype);
}
break;
case AST_FRAME_HTML:
if (!ast_test_flag64(outgoing, DIAL_NOFORWARDHTML)
&& ast_channel_sendhtml(in, f->subclass.integer, f->data.ptr, f->datalen) == -1) {
ast_log(LOG_WARNING, "Unable to send URL\n");
}
break;
default:
break;
}
}
ast_frfree(f);

2
apps/app_queue.c
View File

@@ -3754,7 +3754,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
case AST_CONTROL_REDIRECTING:
if (!update_connectedline) {
ast_verb(3, "Redirecting update to %s prevented\n", inchan_name);
} else {
} else if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
ast_verb(3, "%s redirecting info has changed, passing it to %s\n", ochan_name, inchan_name);
if (ast_channel_redirecting_macro(o->chan, in, f, 1, 1)) {
ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);