diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-30 19:41:30 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-30 19:41:30 +0000 |
| commit | ad7fcc59fbaedb1593089faaab2be9886f22ac90 (patch) | |
| tree | 095f51c71ac7ce2298f882a1c3269c9536ce097d | |
| parent | 2ea6ced97afd0aa7175bd13a20d2c2e0e544ecd3 (diff) | |
Merged revisions 198371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r198371 | seanbright | 2009-05-30 15:38:58 -0400 (Sat, 30 May 2009) | 19 lines
Merged revisions 198370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r198370 | seanbright | 2009-05-30 15:36:20 -0400 (Sat, 30 May 2009) | 12 lines
Properly terminate AMI JabberSend response messages.
The response message (either Error or Success) needs an extra trailing \r\n
after the fields to inform the client that the message is complete.
(closes issue #14876)
Reported by: srt
Patches:
05302009_1.4_res_jabber.c.diff uploaded by seanbright (license 71)
asterisk_14876.patch uploaded by srt (license 378)
trunk-14876-2.diff uploaded by phsultan (license 73)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@198374 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_jabber.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index ad34e6f37..11571ec21 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -3011,17 +3011,17 @@ static int manager_jabber_send(struct mansession *s, const struct message *m) if (!client) { astman_send_error(s, m, "Could not find Sender"); return 0; - } - if (strchr(screenname, '@') && message){ - ast_aji_send_chat(client, screenname, message); + } + if (strchr(screenname, '@') && message) { + ast_aji_send_chat(client, screenname, message); astman_append(s, "Response: Success\r\n"); - if (!ast_strlen_zero(id)) - astman_append(s, "ActionID: %s\r\n",id); - return 0; + } else { + astman_append(s, "Response: Error\r\n"); } - astman_append(s, "Response: Error\r\n"); - if (!ast_strlen_zero(id)) + if (!ast_strlen_zero(id)) { astman_append(s, "ActionID: %s\r\n",id); + } + astman_append(s, "\r\n"); return 0; } |