From: Sean Bright <sean@malleable.com>
Date: Sat, 30 May 2009 19:40:59 +0000 (+0000)
Subject: Merged revisions 198371 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e8686a0056492ef69b45f709b4d5f4e3c7180e0;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@198373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_jabber.c b/res/res_jabber.c
index d2ce3b156c..053056ce94 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -2978,17 +2978,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;
 }