[asterisk-commits] twilson: branch group/aco_xmldocs r373978 - in /team/group/aco_xmldocs: chann...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Sep 27 18:48:19 CDT 2012


Author: twilson
Date: Thu Sep 27 18:48:16 2012
New Revision: 373978

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373978
Log:
Add skeleton for documenting res_xmpp and chan_motif options.

Modified:
    team/group/aco_xmldocs/channels/chan_motif.c
    team/group/aco_xmldocs/res/res_xmpp.c

Modified: team/group/aco_xmldocs/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/team/group/aco_xmldocs/channels/chan_motif.c?view=diff&rev=373978&r1=373977&r2=373978
==============================================================================
--- team/group/aco_xmldocs/channels/chan_motif.c (original)
+++ team/group/aco_xmldocs/channels/chan_motif.c Thu Sep 27 18:48:16 2012
@@ -68,6 +68,54 @@
 #include "asterisk/astobj.h"
 #include "asterisk/abstract_jb.h"
 #include "asterisk/xmpp.h"
+
+/*** DOCUMENTATION
+	<configInfo name="chan_motif" language="en_US">
+		<configFile name="motif.conf">
+			<configObject name="endpoint">
+				<configOption name="context">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="callgroup">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="pickupgroup">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="language">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="musicclass">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="parkinglot">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="accountcode">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="allow">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="disallow">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="connection">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="transport">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="maxicecandidates">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="maxpayloads">
+					<synopsis></synopsis>
+				</configOption>
+			</configObject>
+		</configFile>
+	</configInfo>
+***/
 
 /*! \brief Default maximum number of ICE candidates we will offer */
 #define DEFAULT_MAX_ICE_CANDIDATES "10"
@@ -398,6 +446,7 @@
 
 static struct aco_type endpoint_option = {
 	.type = ACO_ITEM,
+	.name = "endpoint",
 	.category_match = ACO_BLACKLIST,
 	.category = "^general$",
 	.item_alloc = jingle_endpoint_alloc,

Modified: team/group/aco_xmldocs/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/group/aco_xmldocs/res/res_xmpp.c?view=diff&rev=373978&r1=373977&r2=373978
==============================================================================
--- team/group/aco_xmldocs/res/res_xmpp.c (original)
+++ team/group/aco_xmldocs/res/res_xmpp.c Thu Sep 27 18:48:16 2012
@@ -274,6 +274,99 @@
 		<para>Specifying a prefix of <literal>xmpp:</literal> will send the
 		message as an XMPP chat message.</para>
 	</info>
+	<configInfo name="res_xmpp" language="en_US">
+		<configFile name="xmpp.conf">
+			<configObject name="global">
+				<configOption name="debug">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="autoprune">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="autoregister">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="collection_nodes">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="pubsub_autocreate">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="auth_policy">
+					<synopsis></synopsis>
+				</configOption>
+			</configObject>
+			<configObject name="client">
+				<configOption name="username">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="secret">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="serverhost">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="statusmessage">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="pubsub_node">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="context">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="priority">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="port">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="timeout">
+					<synopsis></synopsis>
+				</configOption>
+
+				<configOption name="debug">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="type">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="distribute_events">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="usetls">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="usesasl">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="forceoldssl">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="keepalive">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="autoprune">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="autoregister">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="auth_policy">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="sendtodialplan">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="status">
+					<synopsis></synopsis>
+				</configOption>
+				<configOption name="buddy">
+					<synopsis></synopsis>
+				</configOption>
+			</configObject>
+		</configFile>
+	</configInfo>
 ***/
 
 /*! \brief Supported general configuration flags */
@@ -640,6 +733,7 @@
 
 static struct aco_type global_option = {
 	.type = ACO_GLOBAL,
+	.name = "global",
 	.item_offset = offsetof(struct xmpp_config, global),
 	.category_match = ACO_WHITELIST,
 	.category = "^general$",
@@ -649,6 +743,7 @@
 
 static struct aco_type client_option = {
 	.type = ACO_ITEM,
+	.name = "client",
 	.category_match = ACO_BLACKLIST,
 	.category = "^(general)$",
 	.item_alloc = ast_xmpp_client_config_alloc,




More information about the asterisk-commits mailing list