From 843fdc67730c9154ad08b720e65d28077e08d1c8 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 7 Apr 2009 20:59:06 +0000 Subject: [PATCH] Merged revisions 186720 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r186720 | mmichelson | 2009-04-07 15:46:18 -0500 (Tue, 07 Apr 2009) | 12 lines Merged revisions 186719 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186719 | mmichelson | 2009-04-07 15:43:49 -0500 (Tue, 07 Apr 2009) | 6 lines Ensure that \r\n is printed after the ActionID in an OriginateResponse. (closes issue #14847) Reported by: kobaz ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@186723 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/manager.c b/main/manager.c index 2282417c7b..6869274ab2 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2327,7 +2327,7 @@ static void *fast_originate(void *data) snprintf(requested_channel, AST_CHANNEL_NAME, "%s/%s", in->tech, in->data); /* Tell the manager what happened with the channel */ manager_event(EVENT_FLAG_CALL, "OriginateResponse", - "%s" + "%s%s" "Response: %s\r\n" "Channel: %s\r\n" "Context: %s\r\n" @@ -2336,7 +2336,8 @@ static void *fast_originate(void *data) "Uniqueid: %s\r\n" "CallerIDNum: %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 : "", S_OR(in->cid_num, ""), S_OR(in->cid_name, "") @@ -2434,7 +2435,7 @@ static int action_originate(struct mansession *s, const struct message *m) res = -1; } else { 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->data, data, sizeof(fast->data)); ast_copy_string(fast->app, app, sizeof(fast->app));