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
This commit is contained in:
Sean Bright
2009-05-30 19:36:20 +00:00
parent e86b26f1a8
commit 8fc78eae7a

View File

@@ -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);
astman_append(s, "Response: Failure\r\n");
if (!ast_strlen_zero(id)) {
astman_append(s, "ActionID: %s\r\n", id);
}
astman_append(s, "\r\n");
return 0;
}