[svn-commits] irroot: branch irroot/distrotech-customers-trunk r321669 - in /team/irroot/di...

[SVN commits to the Digium repositories]

Author: irroot
Date: Fri Jun  3 03:44:01 2011
New Revision: 321669

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321669
Log:
automerge enable

Modified:
    team/irroot/distrotech-customers-trunk/CHANGES
    team/irroot/distrotech-customers-trunk/include/asterisk/_private.h
    team/irroot/distrotech-customers-trunk/include/asterisk/channel.h
    team/irroot/distrotech-customers-trunk/include/asterisk/jabber.h
    team/irroot/distrotech-customers-trunk/main/cdr.c

Modified: team/irroot/distrotech-customers-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/CHANGES?view=diff&rev=321669&r1=321668&r2=321669
==============================================================================
--- team/irroot/distrotech-customers-trunk/CHANGES (original)
+++ team/irroot/distrotech-customers-trunk/CHANGES Fri Jun  3 03:44:01 2011
@@ -11,6 +11,19 @@
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.8 to Asterisk 1.10 -----------------
 ------------------------------------------------------------------------------
+
+Text Messaging
+--------------
+ * Asterisk now has protocol independent support for processing text messages
+   outside of a call.  Messages are routed through the Asterisk dialplan.
+   SIP MESSAGE and XMPP are currently supported.  There are options in
+   jabber.conf and sip.conf to allow enabling these features.
+     -> jabber.conf: see the "sendtodialplan" and "context" options.
+     -> sip.conf: see the "accept_outofcall_message" and "auth_message_requests"
+        options.
+   The MESSAGE() dialplan function and MessageSend() application have been
+   added to go along with this functionality.  More detailed usage information
+   can be found on the Asterisk wiki (http://wiki.asterisk.org/).
 
 Parking
 -------

Modified: team/irroot/distrotech-customers-trunk/include/asterisk/_private.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/_private.h?view=diff&rev=321669&r1=321668&r2=321669
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/_private.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/_private.h Fri Jun  3 03:44:01 2011
@@ -47,6 +47,7 @@
 int ast_cel_engine_reload(void);	/*!< Provided by cel.c */
 int ast_ssl_init(void);                 /*!< Provided by ssl.c */
 int ast_test_init(void);            /*!< Provided by test.c */
+int ast_msg_init(void);             /*!< Provided by message.c */
 
 /*!
  * \brief Reload asterisk modules.

Modified: team/irroot/distrotech-customers-trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/channel.h?view=diff&rev=321669&r1=321668&r2=321669
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/channel.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/channel.h Fri Jun  3 03:44:01 2011
@@ -3496,4 +3496,14 @@
 }
 #endif
 
+/*!
+ * \brief Remove a channel from the global channels container
+ *
+ * \param chan channel to remove
+ *
+ * In a case where it is desired that a channel not be available in any lookups
+ * in the global channels conatiner, use this function.
+ */
+void ast_channel_unlink(struct ast_channel *chan);
+
 #endif /* _ASTERISK_CHANNEL_H */

Modified: team/irroot/distrotech-customers-trunk/include/asterisk/jabber.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/jabber.h?view=diff&rev=321669&r1=321668&r2=321669
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/jabber.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/jabber.h Fri Jun  3 03:44:01 2011
@@ -157,6 +157,7 @@
 	char name_space[256];
 	char sid[10]; /* Session ID */
 	char mid[6]; /* Message ID */
+	char context[AST_MAX_CONTEXT];
 	iksid *jid;
 	iksparser *p;
 	iksfilter *f;
@@ -179,6 +180,7 @@
 	int message_timeout;
 	int authorized;
 	int distribute_events;
+	int send_to_dialplan;
 	struct ast_flags flags;
 	int component; /* 0 client,  1 component */
 	struct aji_buddy_container buddies;

Modified: team/irroot/distrotech-customers-trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/cdr.c?view=diff&rev=321669&r1=321668&r2=321669
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/cdr.c (original)
+++ team/irroot/distrotech-customers-trunk/main/cdr.c Fri Jun  3 03:44:01 2011
@@ -111,14 +111,16 @@
 AST_MUTEX_DEFINE_STATIC(cdr_pending_lock);
 static ast_cond_t cdr_pending_cond;
 
-int check_cdr_enabled()
+int check_cdr_enabled(void)
 {
 	return enabled;
 }
 
-/*! Register a CDR driver. Each registered CDR driver generates a CDR
-	\return 0 on success, -1 on failure
-*/
+/*!
+ * \brief Register a CDR driver. Each registered CDR driver generates a CDR
+ * \retval 0 on success.
+ * \retval -1 on error
+ */
 int ast_cdr_register(const char *name, const char *desc, ast_cdrbe be)
 {
 	struct ast_cdr_beitem *i = NULL;