[svn-commits] pabelanger: branch pabelanger/issue17173 r258774 - in /team/pabelanger/issue1...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Apr 25 12:51:57 CDT 2010
Author: pabelanger
Date: Sun Apr 25 12:51:49 2010
New Revision: 258774
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258774
Log:
New manager actions for xmldoc: <ami_command> and <ami_event>.
Modified:
team/pabelanger/issue17173/apps/app_meetme.c
team/pabelanger/issue17173/apps/app_mixmonitor.c
team/pabelanger/issue17173/apps/app_queue.c
team/pabelanger/issue17173/apps/app_senddtmf.c
team/pabelanger/issue17173/apps/app_voicemail.c
team/pabelanger/issue17173/channels/chan_agent.c
team/pabelanger/issue17173/channels/chan_dahdi.c
team/pabelanger/issue17173/channels/chan_iax2.c
team/pabelanger/issue17173/channels/chan_sip.c
team/pabelanger/issue17173/channels/chan_skinny.c
team/pabelanger/issue17173/doc/appdocsxml.dtd
team/pabelanger/issue17173/main/data.c
team/pabelanger/issue17173/main/db.c
team/pabelanger/issue17173/main/features.c
team/pabelanger/issue17173/main/manager.c
team/pabelanger/issue17173/main/pbx.c
team/pabelanger/issue17173/main/xmldoc.c
team/pabelanger/issue17173/res/res_agi.c
team/pabelanger/issue17173/res/res_jabber.c
team/pabelanger/issue17173/res/res_monitor.c
team/pabelanger/issue17173/res/res_mutestream.c
Modified: team/pabelanger/issue17173/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/apps/app_meetme.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/apps/app_meetme.c (original)
+++ team/pabelanger/issue17173/apps/app_meetme.c Sun Apr 25 12:51:49 2010
@@ -460,36 +460,36 @@
<ref type="application">MeetMeChannelAdmin</ref>
</see-also>
</function>
- <manager name="MeetmeMute" language="en_US">
+ <ami_command name="MeetmeMute" language="en_US">
<synopsis>
Mute a Meetme user.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Meetme" required="true" />
<parameter name="Usernum" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="MeetmeUnmute" language="en_US">
+ </ami_command>
+ <ami_command name="MeetmeUnmute" language="en_US">
<synopsis>
Unmute a Meetme user.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Meetme" required="true" />
<parameter name="Usernum" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="MeetmeList" language="en_US">
+ </ami_command>
+ <ami_command name="MeetmeList" language="en_US">
<synopsis>
List participants in a conference.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Conference" required="true">
<para>Conference number.</para>
</parameter>
@@ -499,7 +499,7 @@
MeetmeList will follow as separate events, followed by a final event called
MeetmeListComplete.</para>
</description>
- </manager>
+ </ami_command>
***/
#define CONFIG_FILE_NAME "meetme.conf"
Modified: team/pabelanger/issue17173/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/apps/app_mixmonitor.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/apps/app_mixmonitor.c (original)
+++ team/pabelanger/issue17173/apps/app_mixmonitor.c Sun Apr 25 12:51:49 2010
@@ -125,12 +125,12 @@
<ref type="application">MixMonitor</ref>
</see-also>
</application>
- <manager name="MixMonitorMute" language="en_US">
+ <ami_command name="MixMonitorMute" language="en_US">
<synopsis>
Mute / unMute a Mixmonitor recording.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Channel" required="true">
<para>Used to specify the channel to mute.</para>
</parameter>
@@ -144,7 +144,7 @@
<description>
<para>This action may be used to mute a MixMonitor recording.</para>
</description>
- </manager>
+ </ami_command>
***/
Modified: team/pabelanger/issue17173/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/apps/app_queue.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/apps/app_queue.c (original)
+++ team/pabelanger/issue17173/apps/app_queue.c Sun Apr 25 12:51:49 2010
@@ -505,45 +505,45 @@
<para>Gets or sets queue members penalty.</para>
</description>
</function>
- <manager name="Queues" language="en_US">
+ <ami_command name="Queues" language="en_US">
<synopsis>
Queues.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueStatus" language="en_US">
+ </ami_command>
+ <ami_command name="QueueStatus" language="en_US">
<synopsis>
Show queue status.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" />
<parameter name="Member" />
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueSummary" language="en_US">
+ </ami_command>
+ <ami_command name="QueueSummary" language="en_US">
<synopsis>
Show queue summary.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" />
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueAdd" language="en_US">
+ </ami_command>
+ <ami_command name="QueueAdd" language="en_US">
<synopsis>
Add interface to queue.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" required="true" />
<parameter name="Interface" required="true" />
<parameter name="Penalty" />
@@ -553,25 +553,25 @@
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueRemove" language="en_US">
+ </ami_command>
+ <ami_command name="QueueRemove" language="en_US">
<synopsis>
Remove interface from queue.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" required="true" />
<parameter name="Interface" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="QueuePause" language="en_US">
+ </ami_command>
+ <ami_command name="QueuePause" language="en_US">
<synopsis>
Makes a queue member temporarily unavailable.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Interface" required="true" />
<parameter name="Paused" required="true" />
<parameter name="Queue" />
@@ -579,13 +579,13 @@
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueLog" language="en_US">
+ </ami_command>
+ <ami_command name="QueueLog" language="en_US">
<synopsis>
Adds custom entry in queue_log.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" required="true" />
<parameter name="Event" required="true" />
<parameter name="Uniqueid" />
@@ -594,37 +594,37 @@
</syntax>
<description>
</description>
- </manager>
- <manager name="QueuePenalty" language="en_US">
+ </ami_command>
+ <ami_command name="QueuePenalty" language="en_US">
<synopsis>
Set the penalty for a queue member.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Interface" required="true" />
<parameter name="Penalty" required="true" />
<parameter name="Queue" />
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueRule" language="en_US">
+ </ami_command>
+ <ami_command name="QueueRule" language="en_US">
<synopsis>
Queue Rules.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Rule" />
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueReload" language="en_US">
+ </ami_command>
+ <ami_command name="QueueReload" language="en_US">
<synopsis>
Reload a queue, queues, or any sub-section of a queue or queues.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" />
<parameter name="Members">
<enumlist>
@@ -647,18 +647,18 @@
</syntax>
<description>
</description>
- </manager>
- <manager name="QueueReset" language="en_US">
+ </ami_command>
+ <ami_command name="QueueReset" language="en_US">
<synopsis>
Reset queue statistics.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Queue" />
</syntax>
<description>
</description>
- </manager>
+ </ami_command>
***/
enum {
Modified: team/pabelanger/issue17173/apps/app_senddtmf.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/apps/app_senddtmf.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/apps/app_senddtmf.c (original)
+++ team/pabelanger/issue17173/apps/app_senddtmf.c Sun Apr 25 12:51:49 2010
@@ -59,12 +59,12 @@
<ref type="application">Read</ref>
</see-also>
</application>
- <manager name="PlayDTMF" language="en_US">
+ <ami_command name="PlayDTMF" language="en_US">
<synopsis>
Play DTMF signal on a specific channel.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Channel" required="true">
<para>Channel name to send digit to.</para>
</parameter>
@@ -75,7 +75,7 @@
<description>
<para>Plays a dtmf digit on the specified channel.</para>
</description>
- </manager>
+ </ami_command>
***/
static char *app = "SendDTMF";
Modified: team/pabelanger/issue17173/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/apps/app_voicemail.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/apps/app_voicemail.c (original)
+++ team/pabelanger/issue17173/apps/app_voicemail.c Sun Apr 25 12:51:49 2010
@@ -334,16 +334,16 @@
context.</para>
</description>
</function>
- <manager name="VoicemailUsersList" language="en_US">
+ <ami_command name="VoicemailUsersList" language="en_US">
<synopsis>
List All Voicemail User Information.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
</description>
- </manager>
+ </ami_command>
***/
#ifdef IMAP_STORAGE
Modified: team/pabelanger/issue17173/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/channels/chan_agent.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/channels/chan_agent.c (original)
+++ team/pabelanger/issue17173/channels/chan_agent.c Sun Apr 25 12:51:49 2010
@@ -164,23 +164,23 @@
</syntax>
<description />
</function>
- <manager name="Agents" language="en_US">
+ <ami_command name="Agents" language="en_US">
<synopsis>
Lists agents and their status.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Will list info about all possible agents.</para>
</description>
- </manager>
- <manager name="AgentLogoff" language="en_US">
+ </ami_command>
+ <ami_command name="AgentLogoff" language="en_US">
<synopsis>
Sets an agent as no longer logged in.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Agent" required="true">
<para>Agent ID of the agent to log off.</para>
</parameter>
@@ -191,7 +191,7 @@
<description>
<para>Sets an agent as no longer logged in.</para>
</description>
- </manager>
+ </ami_command>
***/
static const char tdesc[] = "Call Agent Proxy Channel";
Modified: team/pabelanger/issue17173/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/channels/chan_dahdi.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/channels/chan_dahdi.c (original)
+++ team/pabelanger/issue17173/channels/chan_dahdi.c Sun Apr 25 12:51:49 2010
@@ -165,12 +165,12 @@
<para>This application will Accept the R2 call either with charge or no charge.</para>
</description>
</application>
- <manager name="DAHDITransfer" language="en_US">
+ <ami_command name="DAHDITransfer" language="en_US">
<synopsis>
Transfer DAHDI Channel.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="DAHDIChannel" required="true">
<para>DAHDI channel name to transfer.</para>
</parameter>
@@ -178,13 +178,13 @@
<description>
<para>Transfer a DAHDI channel.</para>
</description>
- </manager>
- <manager name="DAHDIHangup" language="en_US">
+ </ami_command>
+ <ami_command name="DAHDIHangup" language="en_US">
<synopsis>
Hangup DAHDI Channel.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="DAHDIChannel" required="true">
<para>DAHDI channel name to hangup.</para>
</parameter>
@@ -192,62 +192,62 @@
<description>
<para>Hangup a DAHDI channel.</para>
</description>
- </manager>
- <manager name="DAHDIDialOffhook" language="en_US">
+ </ami_command>
+ <ami_command name="DAHDIDialOffhook" language="en_US">
<synopsis>
Dial over DAHDI channel while offhook.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="DAHDIChannel" required="true" />
<parameter name="Number" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DAHDIDNDon" language="en_US">
+ </ami_command>
+ <ami_command name="DAHDIDNDon" language="en_US">
<synopsis>
Toggle DAHDI channel Do Not Disturb status ON.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="DAHDIChannel" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DAHDIDNDoff" language="en_US">
+ </ami_command>
+ <ami_command name="DAHDIDNDoff" language="en_US">
<synopsis>
Toggle DAHDI channel Do Not Disturb status OFF.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="DAHDIChannel" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DAHDIShowChannels" language="en_US">
+ </ami_command>
+ <ami_command name="DAHDIShowChannels" language="en_US">
<synopsis>
Show status DAHDI channels.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="DAHDIChannel" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DAHDIRestart" language="en_US">
+ </ami_command>
+ <ami_command name="DAHDIRestart" language="en_US">
<synopsis>
Fully Restart DAHDI channels (terminates calls).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
</description>
- </manager>
+ </ami_command>
***/
#define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
Modified: team/pabelanger/issue17173/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/channels/chan_iax2.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/channels/chan_iax2.c (original)
+++ team/pabelanger/issue17173/channels/chan_iax2.c Sun Apr 25 12:51:49 2010
@@ -176,28 +176,28 @@
</syntax>
<description />
</function>
- <manager name="IAXpeers" language="en_US">
+ <ami_command name="IAXpeers" language="en_US">
<synopsis>
List IAX peers.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
</description>
- </manager>
- <manager name="IAXpeerlist" language="en_US">
+ </ami_command>
+ <ami_command name="IAXpeerlist" language="en_US">
<synopsis>
List IAX Peers.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>List all the IAX peers.</para>
</description>
- </manager>
- <manager name="IAXnetstats" language="en_US">
+ </ami_command>
+ <ami_command name="IAXnetstats" language="en_US">
<synopsis>
Show IAX Netstats.
</synopsis>
@@ -205,18 +205,18 @@
<description>
<para>Show IAX channels network statistics.</para>
</description>
- </manager>
- <manager name="IAXregistry" language="en_US">
+ </ami_command>
+ <ami_command name="IAXregistry" language="en_US">
<synopsis>
Show IAX registrations.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Show IAX registrations.</para>
</description>
- </manager>
+ </ami_command>
***/
/* Define SCHED_MULTITHREADED to run the scheduler in a special
Modified: team/pabelanger/issue17173/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/channels/chan_sip.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/channels/chan_sip.c (original)
+++ team/pabelanger/issue17173/channels/chan_sip.c Sun Apr 25 12:51:49 2010
@@ -471,25 +471,25 @@
Check the <literal>domain=</literal> configuration in <filename>sip.conf</filename>.</para>
</description>
</function>
- <manager name="SIPpeers" language="en_US">
+ <ami_command name="SIPpeers" language="en_US">
<synopsis>
List SIP peers (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Lists SIP peers in text format with details on current status.
Peerlist will follow as separate events, followed by a final event called
PeerlistComplete.</para>
</description>
- </manager>
- <manager name="SIPshowpeer" language="en_US">
+ </ami_command>
+ <ami_command name="SIPshowpeer" language="en_US">
<synopsis>
show SIP peer (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Peer" required="true">
<para>The peer name you want to check.</para>
</parameter>
@@ -497,13 +497,13 @@
<description>
<para>Show one SIP peer with details on current status.</para>
</description>
- </manager>
- <manager name="SIPqualifypeer" language="en_US">
+ </ami_command>
+ <ami_command name="SIPqualifypeer" language="en_US">
<synopsis>
Qualify SIP peers.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Peer" required="true">
<para>The peer name you want to qualify.</para>
</parameter>
@@ -511,25 +511,25 @@
<description>
<para>Qualify a SIP peer.</para>
</description>
- </manager>
- <manager name="SIPshowregistry" language="en_US">
+ </ami_command>
+ <ami_command name="SIPshowregistry" language="en_US">
<synopsis>
Show SIP registrations (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Lists all registration requests and status. Registrations will follow as separate
events. followed by a final event called RegistrationsComplete.</para>
</description>
- </manager>
- <manager name="SIPnotify" language="en_US">
+ </ami_command>
+ <ami_command name="SIPnotify" language="en_US">
<synopsis>
Send a SIP notify.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Channel" required="true">
<para>Peer to receive the notify.</para>
</parameter>
@@ -543,7 +543,7 @@
<para>All parameters for this event must be specified in the body of this request
via multiple Variable: name=value sequences.</para>
</description>
- </manager>
+ </ami_command>
***/
static int min_expiry = DEFAULT_MIN_EXPIRY; /*!< Minimum accepted registration time */
Modified: team/pabelanger/issue17173/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/channels/chan_skinny.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/channels/chan_skinny.c (original)
+++ team/pabelanger/issue17173/channels/chan_skinny.c Sun Apr 25 12:51:49 2010
@@ -72,25 +72,25 @@
#include "asterisk/linkedlists.h"
/*** DOCUMENTATION
- <manager name="SKINNYdevices" language="en_US">
+ <ami_command name="SKINNYdevices" language="en_US">
<synopsis>
List SKINNY devices (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Lists Skinny devices in text format with details on current status.
Devicelist will follow as separate events, followed by a final event called
DevicelistComplete.</para>
</description>
- </manager>
- <manager name="SKINNYshowdevice" language="en_US">
+ </ami_command>
+ <ami_command name="SKINNYshowdevice" language="en_US">
<synopsis>
Show SKINNY device (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Device" required="true">
<para>The device name you want to check.</para>
</parameter>
@@ -98,26 +98,26 @@
<description>
<para>Show one SKINNY device with details on current status.</para>
</description>
- </manager>
- <manager name="SKINNYlines" language="en_US">
+ </ami_command>
+ <ami_command name="SKINNYlines" language="en_US">
<synopsis>
List SKINNY lines (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Lists Skinny lines in text format with details on current status.
Linelist will follow as separate events, followed by a final event called
LinelistComplete.</para>
</description>
- </manager>
- <manager name="SKINNYshowline" language="en_US">
+ </ami_command>
+ <ami_command name="SKINNYshowline" language="en_US">
<synopsis>
Show SKINNY line (text format).
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Line" required="true">
<para>The line name you want to check.</para>
</parameter>
@@ -125,7 +125,7 @@
<description>
<para>Show one SKINNY line with details on current status.</para>
</description>
- </manager>
+ </ami_command>
***/
#ifdef SKINNY_DEVMODE
Modified: team/pabelanger/issue17173/doc/appdocsxml.dtd
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/doc/appdocsxml.dtd?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/doc/appdocsxml.dtd (original)
+++ team/pabelanger/issue17173/doc/appdocsxml.dtd Sun Apr 25 12:51:49 2010
@@ -23,9 +23,13 @@
<!ATTLIST agi name CDATA #REQUIRED>
<!ATTLIST agi language CDATA #REQUIRED>
- <!ELEMENT manager (synopsis?,syntax?,description?,see-also?)>
- <!ATTLIST manager name CDATA #REQUIRED>
- <!ATTLIST manager language CDATA #REQUIRED>
+ <!ELEMENT ami_command (synopsis?,syntax?,description?,see-also?)>
+ <!ATTLIST ami_command name CDATA #REQUIRED>
+ <!ATTLIST ami_command language CDATA #REQUIRED>
+
+ <!ELEMENT ami_event (synopsis?,syntax?,description?,see-also?)>
+ <!ATTLIST ami_event name CDATA #REQUIRED>
+ <!ATTLIST ami_event language CDATA #REQUIRED>
<!ELEMENT see-also (ref|xi:include)*>
Modified: team/pabelanger/issue17173/main/data.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/main/data.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/main/data.c (original)
+++ team/pabelanger/issue17173/main/data.c Sun Apr 25 12:51:49 2010
@@ -42,12 +42,12 @@
#include "asterisk/test.h"
/*** DOCUMENTATION
- <manager name="DataGet" language="en_US">
+ <ami_command name="DataGet" language="en_US">
<synopsis>
Retrieve the data api tree.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Path" required="true" />
<parameter name="Search" />
<parameter name="Filter" />
@@ -55,7 +55,7 @@
<description>
<para>Retrieve the data api tree.</para>
</description>
- </manager>
+ </ami_command>
***/
#define NUM_DATA_NODE_BUCKETS 59
Modified: team/pabelanger/issue17173/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/main/db.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/main/db.c (original)
+++ team/pabelanger/issue17173/main/db.c Sun Apr 25 12:51:49 2010
@@ -49,55 +49,55 @@
#include "db1-ast/include/db.h"
/*** DOCUMENTATION
- <manager name="DBGet" language="en_US">
+ <ami_command name="DBGet" language="en_US">
<synopsis>
Get DB Entry.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Family" required="true" />
<parameter name="Key" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DBPut" language="en_US">
+ </ami_command>
+ <ami_command name="DBPut" language="en_US">
<synopsis>
Put DB entry.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Family" required="true" />
<parameter name="Key" required="true" />
<parameter name="Val" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DBDel" language="en_US">
+ </ami_command>
+ <ami_command name="DBDel" language="en_US">
<synopsis>
Delete DB entry.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Family" required="true" />
<parameter name="Key" required="true" />
</syntax>
<description>
</description>
- </manager>
- <manager name="DBDelTree" language="en_US">
+ </ami_command>
+ <ami_command name="DBDelTree" language="en_US">
<synopsis>
Delete DB Tree.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Family" required="true" />
<parameter name="Key" />
</syntax>
<description>
</description>
- </manager>
+ </ami_command>
***/
static DB *astdb;
Modified: team/pabelanger/issue17173/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/main/features.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/main/features.c (original)
+++ team/pabelanger/issue17173/main/features.c Sun Apr 25 12:51:49 2010
@@ -231,23 +231,23 @@
<ref type="application">ParkedCall</ref>
</see-also>
</application>
- <manager name="ParkedCalls" language="en_US">
+ <ami_command name="ParkedCalls" language="en_US">
<synopsis>
List parked calls.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>List parked calls.</para>
</description>
- </manager>
- <manager name="Park" language="en_US">
+ </ami_command>
+ <ami_command name="Park" language="en_US">
<synopsis>
Park a channel.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Channel" required="true">
<para>Channel name to park.</para>
</parameter>
@@ -261,13 +261,13 @@
<description>
<para>Park a channel.</para>
</description>
- </manager>
- <manager name="Bridge" language="en_US">
+ </ami_command>
+ <ami_command name="Bridge" language="en_US">
<synopsis>
Bridge two channels already in the PBX.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Channel1" required="true">
<para>Channel to Bridge to Channel2.</para>
</parameter>
@@ -285,7 +285,7 @@
<description>
<para>Bridge together two channels already in the PBX.</para>
</description>
- </manager>
+ </ami_command>
***/
#define DEFAULT_PARK_TIME 45000
Modified: team/pabelanger/issue17173/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17173/main/manager.c?view=diff&rev=258774&r1=258773&r2=258774
==============================================================================
--- team/pabelanger/issue17173/main/manager.c (original)
+++ team/pabelanger/issue17173/main/manager.c Sun Apr 25 12:51:49 2010
@@ -76,24 +76,24 @@
#include "asterisk/security_events.h"
/*** DOCUMENTATION
- <manager name="Ping" language="en_US">
+ <ami_command name="Ping" language="en_US">
<synopsis>
Keepalive command.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>A 'Ping' action will ellicit a 'Pong' response. Used to keep the
manager connection open.</para>
</description>
- </manager>
- <manager name="Events" language="en_US">
+ </ami_command>
+ <ami_command name="Events" language="en_US">
<synopsis>
Control Event Flow.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="EventMask" required="true">
<enumlist>
<enum name="on">
@@ -111,19 +111,19 @@
<description>
<para>Enable/Disable sending of events to this manager client.</para>
</description>
- </manager>
- <manager name="Logoff" language="en_US">
+ </ami_command>
+ <ami_command name="Logoff" language="en_US">
<synopsis>
Logoff Manager.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Logoff the current manager session.</para>
</description>
- </manager>
- <manager name="Login" language="en_US">
+ </ami_command>
+ <ami_command name="Login" language="en_US">
<synopsis>
Login Manager.
</synopsis>
@@ -135,24 +135,24 @@
<description>
<para>Login Manager.</para>
</description>
- </manager>
- <manager name="Challenge" language="en_US">
+ </ami_command>
+ <ami_command name="Challenge" language="en_US">
<synopsis>
Generate Challenge for MD5 Auth.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
<para>Generate a challenge for MD5 authentication.</para>
</description>
- </manager>
- <manager name="Hangup" language="en_US">
+ </ami_command>
+ <ami_command name="Hangup" language="en_US">
<synopsis>
Hangup channel.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+ <xi:include xpointer="xpointer(/docs/ami_command[@name='Login']/syntax/parameter[@name='ActionID'])" />
<parameter name="Channel" required="true">
<para>The channel name to be hangup.</para>
</parameter>
@@ -163,13 +163,13 @@
<description>
<para>Hangup a channel.</para>
</description>
- </manager>
- <manager name="Status" language="en_US">
+ </ami_command>
+ <ami_command name="Status" language="en_US">
<synopsis>
List channel status.
</synopsis>
<syntax>
- <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
[... 748 lines stripped ...]
More information about the svn-commits
mailing list