kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_dial.c: Make 'A' option pass COLP updates." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-09-29 07:26:58 -05:00
committed by Gerrit Code Review
parent 5efb96520b e36b5f1e8e
commit 549d726065
1 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
apps/app_dial.c
View File

@@ -2748,34 +2748,50 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
active_chan = ast_waitfor_n(chans, 2, &ms); active_chan = ast_waitfor_n(chans, 2, &ms);
if (active_chan) { if (active_chan) {
struct ast_channel *other_chan;
struct ast_frame *fr = ast_read(active_chan); struct ast_frame *fr = ast_read(active_chan);
if (!fr) { if (!fr) {
ast_autoservice_chan_hangup_peer(chan, peer); ast_autoservice_chan_hangup_peer(chan, peer);
res = -1; res = -1;
goto done; goto done;
} }
switch(fr->frametype) { switch (fr->frametype) {
case AST_FRAME_DTMF_END: case AST_FRAME_DTMF_END:
digit = fr->subclass.integer; digit = fr->subclass.integer;
if (active_chan == peer && strchr(AST_DIGIT_ANY, res)) { if (active_chan == peer && strchr(AST_DIGIT_ANY, res)) {
ast_stopstream(peer); ast_stopstream(peer);
res = ast_senddigit(chan, digit, 0); res = ast_senddigit(chan, digit, 0);
}
break;
case AST_FRAME_CONTROL:
switch (fr->subclass.integer) {
case AST_CONTROL_HANGUP:
ast_frfree(fr);
ast_autoservice_chan_hangup_peer(chan, peer);
res = -1;
goto done;
case AST_CONTROL_CONNECTED_LINE:
/* Pass COLP update to the other channel. */
if (active_chan == chan) {
other_chan = peer;
} else {
other_chan = chan;
} }
break; if (ast_channel_connected_line_sub(active_chan, other_chan, fr, 1)
case AST_FRAME_CONTROL: && ast_channel_connected_line_macro(active_chan,
switch (fr->subclass.integer) { other_chan, fr, other_chan == chan, 1)) {
case AST_CONTROL_HANGUP: ast_indicate_data(other_chan, fr->subclass.integer,
ast_frfree(fr); fr->data.ptr, fr->datalen);
ast_autoservice_chan_hangup_peer(chan, peer);
res = -1;
goto done;
default:
break;
} }
break; break;
default: default:
/* Ignore all others */
break; break;
}
break;
default:
/* Ignore all others */
break;
} }
ast_frfree(fr); ast_frfree(fr);
} }