[asterisk-commits] mjordan: trunk r374612 - in /trunk: ./ main/message.c res/res_xmpp.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Oct  5 20:47:00 2012
New Revision: 374612

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374612
Log:
Update documentation for MessageSend application/command's From field for XMPP

When using the channel technology agnostic application/AMI command MessageSend,
the "From" field is technically optional for the SIP channel driver.  However,
if being sent by the XMPP resource module (either res_xmpp or res_jabber), the
"From" field is necessary, and must correspond to a defined account.  This
patch updates the documentation for this application/AMI command to reflect
this.

(closes issue ASTERISK-20405)
Reported by: Leif Madsen
........

Merged revisions 374611 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/message.c
    trunk/res/res_xmpp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/message.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/message.c?view=diff&rev=374612&r1=374611&r2=374612
==============================================================================
--- trunk/main/message.c (original)
+++ trunk/main/message.c Fri Oct  5 20:47:00 2012
@@ -129,6 +129,7 @@
 				<para>A From URI for the message if needed for the
 				message technology being used to send this message.</para>
 				<xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" />
+				<xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
 			</parameter>
 		</syntax>
 		<description>
@@ -171,6 +172,7 @@
 				<para>A From URI for the message if needed for the
 				message technology being used to send this message.</para>
 				<xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" />
+				<xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
 			</parameter>
 			<parameter name="Body">
 				<para>The message body text.  This must not contain any newlines as that

Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=374612&r1=374611&r2=374612
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Fri Oct  5 20:47:00 2012
@@ -284,6 +284,11 @@
 		<para>Specifying a prefix of <literal>xmpp:</literal> will send the
 		message as an XMPP chat message.</para>
 	</info>
+	<info name="XMPPMessageFromInfo" language="en_US" tech="XMPP">
+		<para>Specifying a prefix of <literal>xmpp:</literal> will specify the
+		account defined in <literal>xmpp.conf</literal> to send the message from.
+		Note that this field is required for XMPP messages.</para>
+	</info>
 ***/
 
 /*! \brief Supported general configuration flags */