From 661ac149115dd23c421c1445a1d07f92249db243 Mon Sep 17 00:00:00 2001 From: Jonathan Rose <jrose@digium.com> Date: Fri, 13 Dec 2013 21:35:50 +0000 Subject: [PATCH] documentation: Add PJSIP technology to messaging documentation ........ Merged revisions 403796 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403797 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/message.c | 4 ++++ res/res_pjsip_messaging.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/main/message.c b/main/message.c index 132ef302a3..ef2c97f1fa 100644 --- a/main/message.c +++ b/main/message.c @@ -122,12 +122,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <syntax> <parameter name="to" required="true"> <para>A To URI for the message.</para> + <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageToInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageToInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageToInfo'])" /> </parameter> <parameter name="from" required="false"> <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='PJSIPMessageFromInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" /> </parameter> @@ -165,12 +167,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" /> <parameter name="To" required="true"> <para>The URI the message is to be sent to.</para> + <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageToInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageToInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageToInfo'])" /> </parameter> <parameter name="From"> <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='PJSIPMessageFromInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" /> <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" /> </parameter> diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c index 00923b23ba..f5f419b1f5 100644 --- a/res/res_pjsip_messaging.c +++ b/res/res_pjsip_messaging.c @@ -23,6 +23,16 @@ <support_level>core</support_level> ***/ +/*** DOCUMENTATION + <info name="PJSIPMessageFromInfo" language="en_US" tech="PJSIP"> + <para>The <literal>from</literal> parameter can be a configured endpoint + or in the form of "display-name" <URI>.</para> + </info> + <info name="PJSIPMessageToInfo" language="en_US" tech="PJSIP"> + <para>Specifying a prefix of <literal>pjsip:</literal> will send the + message as a SIP MESSAGE request.</para> + </info> + ***/ #include "asterisk.h" #include "pjsua-lib/pjsua.h" -- GitLab