[asterisk-commits] seanbright: branch 1.6.0 r198372 - in /branches/1.6.0: ./ res/res_jabber.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat May 30 14:40:16 2009
New Revision: 198372

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198372
Log:
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)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_jabber.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_jabber.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/res/res_jabber.c?view=diff&rev=198372&r1=198371&r2=198372
==============================================================================
--- branches/1.6.0/res/res_jabber.c (original)
+++ branches/1.6.0/res/res_jabber.c Sat May 30 14:40:16 2009
@@ -2979,17 +2979,17 @@
 	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;
-	}
-	astman_append(s, "Response: Error\r\n");
-	if (!ast_strlen_zero(id))
+	} 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;
 }