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

Ensure that \r\n is printed after the ActionID in an OriginateResponse.

Browse Source 
(closes issue #14847)
Reported by: kobaz



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@186719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-04-07 20:43:49 +00:00
parent e2c30564bf
commit 8c021d9334
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/manager.c
View File

@@ -1821,7 +1821,7 @@ static void *fast_originate(void *data)
snprintf(requested_channel, AST_CHANNEL_NAME, "%s/%s", in->tech, in->data); snprintf(requested_channel, AST_CHANNEL_NAME, "%s/%s", in->tech, in->data);
/* Tell the manager what happened with the channel */ /* Tell the manager what happened with the channel */
manager_event(EVENT_FLAG_CALL, "OriginateResponse", manager_event(EVENT_FLAG_CALL, "OriginateResponse",
"%s" "%s%s"
"Response: %s\r\n" "Response: %s\r\n"
"Channel: %s\r\n" "Channel: %s\r\n"
"Context: %s\r\n" "Context: %s\r\n"
@@ -1831,7 +1831,8 @@ static void *fast_originate(void *data)
"CallerID: %s\r\n" /* This parameter is deprecated and will be removed post-1.4 */ "CallerID: %s\r\n" /* This parameter is deprecated and will be removed post-1.4 */
"CallerIDNum: %s\r\n" "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n", "CallerIDName: %s\r\n",
in->idtext, res ? "Failure" : "Success", chan ? chan->name : requested_channel, in->context, in->exten, reason, in->idtext, ast_strlen_zero(in->idtext) ? "" : "\r\n", res ? "Failure" : "Success",
chan ? chan->name : requested_channel, in->context, in->exten, reason,
chan ? chan->uniqueid : "<null>", chan ? chan->uniqueid : "<null>",
S_OR(in->cid_num, "<unknown>"), S_OR(in->cid_num, "<unknown>"),
S_OR(in->cid_num, "<unknown>"), S_OR(in->cid_num, "<unknown>"),
@@ -1931,7 +1932,7 @@ static int action_originate(struct mansession *s, const struct message *m)
res = -1; res = -1;
} else { } else {
if (!ast_strlen_zero(id)) if (!ast_strlen_zero(id))
snprintf(fast->idtext, sizeof(fast->idtext), "ActionID: %s\r\n", id); snprintf(fast->idtext, sizeof(fast->idtext), "ActionID: %s", id);
ast_copy_string(fast->tech, tech, sizeof(fast->tech)); ast_copy_string(fast->tech, tech, sizeof(fast->tech));
ast_copy_string(fast->data, data, sizeof(fast->data)); ast_copy_string(fast->data, data, sizeof(fast->data));
ast_copy_string(fast->app, app, sizeof(fast->app)); ast_copy_string(fast->app, app, sizeof(fast->app));