kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix helper app

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-10-09 14:12:26 +00:00
parent 1b19a2b1de
commit 7198e00097
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channel.c
View File

@@ -1509,15 +1509,10 @@ struct ast_channel *__ast_request_and_dial(char *type, int format, void *data, i
while( (var = strtok_r(NULL, "|", &tmp)) ) { while( (var = strtok_r(NULL, "|", &tmp)) ) {
pbx_builtin_setvar( chan, var ); pbx_builtin_setvar( chan, var );
} /* /JDG */ } /* /JDG */
if (oh->context && *oh->context)
strncpy(chan->context, oh->context, sizeof(chan->context) - 1);
if (oh->exten && *oh->exten)
strncpy(chan->exten, oh->exten, sizeof(chan->exten) - 1);
if (oh->callerid && *oh->callerid) if (oh->callerid && *oh->callerid)
ast_set_callerid(chan, oh->callerid, 1); ast_set_callerid(chan, oh->callerid, 1);
if (oh->account && *oh->account) if (oh->account && *oh->account)
ast_cdr_setaccount(chan, oh->account); ast_cdr_setaccount(chan, oh->account);
chan->priority = oh->priority;
} }
if (callerid && strlen(callerid)) if (callerid && strlen(callerid))
ast_set_callerid(chan, callerid, 1); ast_set_callerid(chan, callerid, 1);
@@ -1561,8 +1556,18 @@ struct ast_channel *__ast_request_and_dial(char *type, int format, void *data, i
ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data); ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
} else } else
ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data); ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
if (chan && (chan->_state == AST_STATE_UP)) if (chan) {
state = AST_CONTROL_ANSWER; /* Final fixups */
if (oh) {
if (oh->context && *oh->context)
strncpy(chan->context, oh->context, sizeof(chan->context) - 1);
if (oh->exten && *oh->exten)
strncpy(chan->exten, oh->exten, sizeof(chan->exten) - 1);
chan->priority = oh->priority;
}
if (chan->_state == AST_STATE_UP)
state = AST_CONTROL_ANSWER;
}
if (outstate) if (outstate)
*outstate = state; *outstate = state;
if (chan && res <= 0) { if (chan && res <= 0) {