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

Set dialed peer number properly when ringing multiple channels (bug #3437)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-27 16:33:12 +00:00
parent 7a250ebd34
commit 1f7c871993
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_dial.c
View File

@@ -886,6 +886,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
cur = rest; cur = rest;
continue; continue;
} }
pbx_builtin_setvar_helper(tmp->chan, "DIALEDPEERNUMBER", numsubst);
if (!ast_strlen_zero(tmp->chan->call_forward)) { if (!ast_strlen_zero(tmp->chan->call_forward)) {
char tmpchan[256]=""; char tmpchan[256]="";
char *stuff; char *stuff;
@@ -1059,8 +1060,11 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
ast_cdr_setdestchan(chan->cdr, peer->name); ast_cdr_setdestchan(chan->cdr, peer->name);
if (peer->name) if (peer->name)
pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", peer->name); pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", peer->name);
if (numsubst)
pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", numsubst); number = pbx_builtin_getvar_helper(peer, "DIALEDPEERNUMBER");
if (!number)
number = numsubst;
pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", number);
/* JDG: sendurl */ /* JDG: sendurl */
if ( url && !ast_strlen_zero(url) && ast_channel_supports_html(peer) ) { if ( url && !ast_strlen_zero(url) && ast_channel_supports_html(peer) ) {
ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", url); ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", url);

10
manager.c
View File

@@ -840,16 +840,18 @@ static void *fast_originate(void *data)
"%s" "%s"
"Channel: %s/%s\r\n" "Channel: %s/%s\r\n"
"Context: %s\r\n" "Context: %s\r\n"
"Exten: %s\r\n", "Exten: %s\r\n"
in->idtext, in->tech, in->data, in->context, in->exten); "Reason: %i\r\n",
in->idtext, in->tech, in->data, in->context, in->exten, reason);
else else
manager_event(EVENT_FLAG_CALL, manager_event(EVENT_FLAG_CALL,
"OriginateFailure", "OriginateFailure",
"%s" "%s"
"Channel: %s/%s\r\n" "Channel: %s/%s\r\n"
"Context: %s\r\n" "Context: %s\r\n"
"Exten: %s\r\n", "Exten: %s\r\n"
in->idtext, in->tech, in->data, in->context, in->exten); "Reason: %i\r\n",
in->idtext, in->tech, in->data, in->context, in->exten, reason);
free(in); free(in);
return NULL; return NULL;