From a7a10088f35ab9379c54b69da108cb4d78b93092 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Sat, 6 Oct 2012 01:44:41 +0000 Subject: [PATCH] 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 --- main/message.c | 2 ++ res/res_xmpp.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/main/message.c b/main/message.c index 83486b890f..b1700547ef 100644 --- a/main/message.c +++ b/main/message.c @@ -129,6 +129,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") A From URI for the message if needed for the message technology being used to send this message. + @@ -171,6 +172,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") A From URI for the message if needed for the message technology being used to send this message. + 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 bcaf02f7ba..75c20d1c8f 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -274,6 +274,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") Specifying a prefix of xmpp: will send the message as an XMPP chat message. + + Specifying a prefix of xmpp: will specify the + account defined in xmpp.conf to send the message from. + Note that this field is required for XMPP messages. + ***/ /*! \brief Supported general configuration flags */ -- 2.47.2