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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@374611 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/message.c b/main/message.c
index 83486b890fcb8cb6c914c94b2fac05b123b05da6..b1700547ef09d655e1fd0e258b8141a50db2e75b 100644 (file)
--- a/main/message.c
+++ b/main/message.c
@@ -129,6 +129,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <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 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <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

diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index bcaf02f7bac870c5ece7d05b881541f8f92301a8..75c20d1c8f891c8dec27cf470d825a5ce72f3302 100644 (file)
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -274,6 +274,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <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 */