From 90c3db40ed8dcf8bacc0cb7dc8ed930cdcab8dfa Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Sat, 30 May 2009 19:38:58 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@198371 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_jabber.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/res/res_jabber.c b/res/res_jabber.c index 314e9919a3..7444f8faeb 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -3009,17 +3009,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); - astman_append(s, "Response: Success\r\n"); - if (!ast_strlen_zero(id)) - astman_append(s, "ActionID: %s\r\n",id); - return 0; } - astman_append(s, "Response: Error\r\n"); - if (!ast_strlen_zero(id)) + if (strchr(screenname, '@') && message) { + ast_aji_send_chat(client, screenname, message); + astman_append(s, "Response: Success\r\n"); + } else { + astman_append(s, "Response: Error\r\n"); + } + if (!ast_strlen_zero(id)) { astman_append(s, "ActionID: %s\r\n",id); + } + astman_append(s, "\r\n"); return 0; }