[asterisk-commits] mjordan: trunk r418325 - in /trunk: ./ include/asterisk/xmpp.h

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jul 10 10:36:57 CDT 2014


Author: mjordan
Date: Thu Jul 10 10:36:55 2014
New Revision: 418325

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418325
Log:
include/asterisk/xmpp.h: Convert indentation to tabs

This is a whitespace only change.
........

Merged revisions 418323 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 418324 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/xmpp.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/include/asterisk/xmpp.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/xmpp.h?view=diff&rev=418325&r1=418324&r2=418325
==============================================================================
--- trunk/include/asterisk/xmpp.h (original)
+++ trunk/include/asterisk/xmpp.h Thu Jul 10 10:36:55 2014
@@ -69,70 +69,70 @@
 
 /*! \brief Client connection states */
 enum xmpp_state {
-        XMPP_STATE_DISCONNECTING,   /*!< Client is disconnecting */
-        XMPP_STATE_DISCONNECTED,    /*!< Client is disconnected */
-        XMPP_STATE_CONNECTING,      /*!< Client is connecting */
-        XMPP_STATE_REQUEST_TLS,     /*!< Client should request TLS */
-        XMPP_STATE_REQUESTED_TLS,   /*!< Client has requested TLS */
-        XMPP_STATE_AUTHENTICATE,    /*!< Client needs to authenticate */
-        XMPP_STATE_AUTHENTICATING,  /*!< Client is authenticating */
-        XMPP_STATE_ROSTER,          /*!< Client is currently getting the roster */
-        XMPP_STATE_CONNECTED,       /*!< Client is fully connected */
+	XMPP_STATE_DISCONNECTING,   /*!< Client is disconnecting */
+	XMPP_STATE_DISCONNECTED,    /*!< Client is disconnected */
+	XMPP_STATE_CONNECTING,      /*!< Client is connecting */
+	XMPP_STATE_REQUEST_TLS,     /*!< Client should request TLS */
+	XMPP_STATE_REQUESTED_TLS,   /*!< Client has requested TLS */
+	XMPP_STATE_AUTHENTICATE,    /*!< Client needs to authenticate */
+	XMPP_STATE_AUTHENTICATING,  /*!< Client is authenticating */
+	XMPP_STATE_ROSTER,          /*!< Client is currently getting the roster */
+	XMPP_STATE_CONNECTED,       /*!< Client is fully connected */
 };
 
 /*! \brief Resource capabilities */
 struct ast_xmpp_capabilities {
-        char node[200];        /*!< Node string from the capabilities stanza in presence notification */
-        char version[50];      /*!< Version string from the capabilities stanza in presence notification */
-        unsigned int jingle:1; /*!< Set if the resource supports Jingle */
-        unsigned int google:1; /*!< Set if the resource supports Google Talk */
+	char node[200];        /*!< Node string from the capabilities stanza in presence notification */
+	char version[50];      /*!< Version string from the capabilities stanza in presence notification */
+	unsigned int jingle:1; /*!< Set if the resource supports Jingle */
+	unsigned int google:1; /*!< Set if the resource supports Google Talk */
 };
 
 /*! \brief XMPP Resource */
 struct ast_xmpp_resource {
-        char resource[XMPP_MAX_RESJIDLEN]; /*!< JID of the resource */
-        int status;                        /*!< Current status of the resource */
-        char *description;                 /*!< Description of the resource */
-        int priority;                      /*!< Priority, used for deciding what resource to use */
-        struct ast_xmpp_capabilities caps; /*!< Capabilities of the resource */
+	char resource[XMPP_MAX_RESJIDLEN]; /*!< JID of the resource */
+	int status;                        /*!< Current status of the resource */
+	char *description;                 /*!< Description of the resource */
+	int priority;                      /*!< Priority, used for deciding what resource to use */
+	struct ast_xmpp_capabilities caps; /*!< Capabilities of the resource */
 };
 
 /*! \brief XMPP Message */
 struct ast_xmpp_message {
-        char *from;                            /*!< Who the message is from */
-        char *message;                         /*!< Message contents */
-        char id[25];                           /*!< Identifier for the message */
-        struct timeval arrived;                /*!< When the message arrived */
-        AST_LIST_ENTRY(ast_xmpp_message) list; /*!< Linked list information */
+	char *from;                            /*!< Who the message is from */
+	char *message;                         /*!< Message contents */
+	char id[25];                           /*!< Identifier for the message */
+	struct timeval arrived;                /*!< When the message arrived */
+	AST_LIST_ENTRY(ast_xmpp_message) list; /*!< Linked list information */
 };
 
 /*! \brief XMPP Buddy */
 struct ast_xmpp_buddy {
-        char id[XMPP_MAX_JIDLEN];        /*!< JID of the buddy */
-        struct ao2_container *resources; /*!< Resources for the buddy */
-        unsigned int subscribe:1;        /*!< Need to subscribe to get their status */
+	char id[XMPP_MAX_JIDLEN];        /*!< JID of the buddy */
+	struct ao2_container *resources; /*!< Resources for the buddy */
+	unsigned int subscribe:1;        /*!< Need to subscribe to get their status */
 };
 
 /*! \brief XMPP Client Connection */
 struct ast_xmpp_client {
-        AST_DECLARE_STRING_FIELDS(
-                AST_STRING_FIELD(name); /*!< Name of the client configuration */
-                );
-        char mid[6]; /* Message ID */
-        iksid *jid;
-        iksparser *parser;
-        iksfilter *filter;
-        ikstack *stack;
+	AST_DECLARE_STRING_FIELDS(
+		AST_STRING_FIELD(name); /*!< Name of the client configuration */
+		);
+	char mid[6]; /* Message ID */
+	iksid *jid;
+	iksparser *parser;
+	iksfilter *filter;
+	ikstack *stack;
 #ifdef HAVE_OPENSSL
-        SSL_CTX *ssl_context;
-        SSL *ssl_session;
-        const SSL_METHOD *ssl_method;
-        unsigned int stream_flags;
+	SSL_CTX *ssl_context;
+	SSL *ssl_session;
+	const SSL_METHOD *ssl_method;
+	unsigned int stream_flags;
 #endif /* HAVE_OPENSSL */
-        enum xmpp_state state;
-        struct ao2_container *buddies;
-        AST_LIST_HEAD(, ast_xmpp_message) messages;
-        pthread_t thread;
+	enum xmpp_state state;
+	struct ao2_container *buddies;
+	AST_LIST_HEAD(, ast_xmpp_message) messages;
+	pthread_t thread;
 	int timeout;
 	unsigned int reconnect:1; /*!< Reconnect this client */
 	struct stasis_subscription *mwi_sub; /*!< If distributing event information the MWI subscription */




More information about the asterisk-commits mailing list