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.4@198370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 0079ee9ff873d30a9e2e494fdfa3655fffaa1192..d1729f17936c00ada1ef55f3b537f91d91e83dac 100644 (file)
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -2423,16 +2423,16 @@ static int manager_jabber_send(struct mansession *s, const struct message *m)
                astman_send_error(s, m, "Could not find Sender");
                return 0;
        }       
-       if (strchr(screenname, '@') && message){
-               ast_aji_send(client, screenname, message);      
-               if (!ast_strlen_zero(id))
-                       astman_append(s, "ActionID: %s\r\n",id);
+       if (strchr(screenname, '@') && message) {
+               ast_aji_send(client, screenname, message);
                astman_append(s, "Response: Success\r\n");
-               return 0;
+       } else {
+               astman_append(s, "Response: Failure\r\n");
+       }
+       if (!ast_strlen_zero(id)) {
+               astman_append(s, "ActionID: %s\r\n", id);
        }
-       if (!ast_strlen_zero(id))
-               astman_append(s, "ActionID: %s\r\n",id);
-       astman_append(s, "Response: Failure\r\n");
+       astman_append(s, "\r\n");
        return 0;
 }