diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-07 20:49:54 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-07 20:49:54 +0000 |
| commit | 0cbc7156056db56111d47f47d7382f8011cf0e73 (patch) | |
| tree | ca6018a7108678a5363f21055e2fd85d7a062d9a /main/manager.c | |
| parent | 5bfb3ed1de0a43a38a5e724f7f6e149a59560a5e (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@186721 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c index 72b4c3f10..e503981fa 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2132,7 +2132,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" @@ -2141,7 +2141,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 : "<null>", S_OR(in->cid_num, "<unknown>"), S_OR(in->cid_name, "<unknown>") @@ -2239,7 +2240,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)); |