From 8c021d9334c70c7d325c9edb45b2d78b3134f05b Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 7 Apr 2009 20:43:49 +0000 Subject: [PATCH] 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.4@186719 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 e88af7f98a..6ed6a75c6e 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1821,7 +1821,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" @@ -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 */ "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_num, ""), @@ -1931,7 +1932,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)); -- 2.47.2