Add a new unified Jingle, Google Jingle, and Google Talk channel driver written from scratch called chan_motif.

This channel driver is a replacement for both chan_gtalk and chan_jingle but adds additional features not found in either.
These features include full configuration reload, video, full codec support, bidirectional cause code mapping, hold,
unhold, and ringing indication. It is also compliant with the current published Jingle and Google Jingle specifications.
The original Google Talk protocol is also supported for Google Voice interoperability.

You may ask yourself though where the name motif comes from... and I would say to you... music!

motif: a perceivable or salient recurring fragment or succession of notes

Sorta like a jingle!

Review: https://reviewboard.asterisk.org/r/1917/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369769 65c4cc65-6c06-0410-ace0-fbb531ad65f3

CHANGES

@@ -295,6 +295,15 @@ chan_ooh323
  * Direct media functionality has been added.
    Options in config are:  directmedia (directrtp) and directrtpsetup (earlydirect)
 
+chan_motif
+----------
+ * A new channel driver named chan_motif has been added which provides support for
+   Google Talk and Jingle in a single channel driver. This new channel driver includes
+   support for both audio and video, RFC2833 DTMF, all codecs supported by Asterisk,
+   hold, unhold, and ringing notification. It is also compliant with the current Jingle
+   specification, current Google Jingle specification, and the original Google Talk
+   protocol.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.8 to Asterisk 10 -------------------
 ------------------------------------------------------------------------------

UPGRADE.txt

@@ -89,6 +89,14 @@ app_followme:
    You now have until the last step times out to decide if you want to accept
    the call or not before being disconnected.
 
+chan_gtalk:
+ - chan_gtalk has been deprecated in favor of the chan_motif channel driver. It is recommended
+   that users switch to using it as it is a core supported module.
+
+chan_jingle:
+ - chan_jingle has been deprecated in favor of the chan_motif channel driver. It is recommended
+   that users switch to using it as it is a core supported module.
+
 SIP
 ===
  - A new option "tonezone" for setting default tonezone for the channel driver

channels/chan_gtalk.c

@@ -32,6 +32,7 @@
  */
 
 /*** MODULEINFO
+        <defaultenabled>no</defaultenabled>
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>

configs/motif.conf.sample

@@ -0,0 +1,85 @@
+; Sample configuration file for chan_motif
+
+; Transports
+;
+; There are three different transports and protocol derivatives supported by chan_motif. They are in order of preference:
+; Jingle using ICE-UDP, Google Jingle, and Google-V1.
+;
+; Jingle as defined in XEP-0166 supports the widest range of features. It is referred to as "ice-udp" in this file. This is
+; the specification that Jingle clients implement.
+;
+; Google Jingle follows the Jingle specification for signaling but uses a custom transport for media. It is supported
+; by the Google Talk Plug-in in Gmail and by some other Jingle clients. It is referred to as "google" in this file.
+;
+; Google-V1 is the original Google Talk signaling protocol which uses an initial preliminary version of Jingle.
+; It also uses the same custom transport as Google Jingle for media. It is supported by Google Voice, some other Jingle
+; clients, and the Windows Google Talk client. It is referred to as "google-v1" in this file.
+;
+; Incoming sessions will automatically switch to the correct transport once it has been determined.
+;
+; Outgoing sessions are capable of determining if the target is capable of Jingle or a Google transport if the target is
+; in the roster. Unfortunately it is not possible to differentiate between a Google Jingle or Google-V1 capable resource
+; until a session initiate attempt occurs. If a resource is determined to use a Google transport it will initially use
+; Google Jingle but will fall back to Google-V1 if required.
+;
+; If an outgoing session attempt fails due to failure to support the given transport chan_motif will fall back in preference
+; order listed at the beginning of this document until all transports have been exhausted.
+;
+
+; Dialing and Resource Selection Strategy
+;
+; Placing a call through an endpoint can be accomplished using the following dial string:
+;
+; Motif/<endpoint name>/<target>
+;
+; When placing an outgoing call through an endpoint the requested target is searched for in the roster list. If present
+; the first Jingle or Google Jingle capable resource is specifically targetted. Since the capabilities of the resource are
+; known the outgoing session initation will disregard the configured transport and use the determined one.
+;
+; If the target is not found in the roster the target will be used as-is and a session will be initiated using the
+; transport specified in this configuration file. If no transport has been specified the endpoint defaults to ice-udp.
+;
+
+; Video Support
+;
+; Support for video does not need to be explicitly enabled. Configuring any video codec on your endpoint will
+; automatically enable it.
+
+; DTMF
+;
+; The only supported method for DTMF is RFC2833. This is always enabled on audio streams and negotiated if possible.
+
+; CallerID
+;
+; The incoming caller id number is populated with the username of the caller and the name is populated with the full
+; identity of the caller. If you would like to perform authentication or filtering of incoming calls it is recommended
+; that you use these fields to do so.
+;
+; Outgoing caller id can *not* be set.
+
+; Default template for endpoints, to be included in their definition
+[default](!)
+disallow=all
+allow=ulaw
+allow=h264
+context=incoming-motif ; Default context that incoming sessions will land in
+
+;maxicecandidates = 10 ; Maximum number of ICE candidates we will offer
+;maxpayloads = 30      ; Maximum number of payloads we will offer
+
+; Sample configuration entry for Jingle
+[jingle-endpoint](default)
+transport=ice-udp               ; Change the default protocol of outgoing sessions to Jingle ICE-UDP
+allow=g722                      ; Add G.722 as an allowed format since the other side may support it
+connection=local-jabber-account ; Connection to accept traffic on and send traffic out
+accountcode=jingle              ; Account code for CDR purposes
+
+; Sample configuration entry for Google Talk
+[gtalk-endpoint](default)
+transport=google         ; Since this is a Google Talk endpoint we want to offer Google Jingle for outgoing sessions
+connection=gtalk-account
+
+; Sample configuration entry for Google Voice
+[gvoice](default)
+transport=google-v1       ; Google Voice uses the original Google Talk protocol
+connection=gvoice-account

include/asterisk/xmpp.h

@@ -35,7 +35,7 @@
 #endif /* HAVE_OPENSSL */
 
 /* file is read by blocks with this size */
-#define NET_IO_BUF_SIZE 4096
+#define NET_IO_BUF_SIZE 16384
 
 /* Return value for timeout connection expiration */
 #define IKS_NET_EXPIRED 12

res/res_jabber.c

@@ -31,6 +31,7 @@
  */
 
 /*** MODULEINFO
+        <defaultenabled>no</defaultenabled>
 	<depend>iksemel</depend>
 	<use type="external">openssl</use>
 	<support_level>extended</support_level>

res/res_xmpp.c

@@ -24,7 +24,7 @@
  *
  * \extref Iksemel http://code.google.com/p/iksemel/
  *
- * A refereouce module for interfacting Asterisk directly as a client or component with
+ * A reference module for interfacting Asterisk directly as a client or component with
  * an XMPP/Jabber compliant server.
  *
  * This module is based upon the original res_jabber as done by Matt O'Gorman.
@@ -32,7 +32,6 @@
  */
 
 /*** MODULEINFO
-	<defaultenabled>no</defaultenabled>
 	<depend>iksemel</depend>
 	<use type="external">openssl</use>
 	<support_level>core</support_level>

res/res_xmpp.exports.in

@@ -0,0 +1,17 @@
+{
+	global:
+		LINKER_SYMBOL_PREFIXast_xmpp_client_find;
+		LINKER_SYMBOL_PREFIXast_xmpp_client_disconnect;
+		LINKER_SYMBOL_PREFIXast_xmpp_client_unref;
+		LINKER_SYMBOL_PREFIXast_xmpp_client_lock;
+		LINKER_SYMBOL_PREFIXast_xmpp_client_unlock;
+		LINKER_SYMBOL_PREFIXast_xmpp_client_send;
+		LINKER_SYMBOL_PREFIXast_xmpp_client_send_message;
+		LINKER_SYMBOL_PREFIXast_xmpp_chatroom_invite;
+		LINKER_SYMBOL_PREFIXast_xmpp_chatroom_join;
+		LINKER_SYMBOL_PREFIXast_xmpp_chatroom_send;
+		LINKER_SYMBOL_PREFIXast_xmpp_chatroom_leave;
+		LINKER_SYMBOL_PREFIXast_xmpp_increment_mid;
+	local:
+		*;
+};