[asterisk-commits] mogorman: trunk r43185 - in /trunk: ./ channels/ configs/ doc/

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Mon Sep 18 11:36:14 2006
New Revision: 43185

URL: http://svn.digium.com/view/asterisk?rev=43185&view=rev
Log:
seperate jingle and gtalk so it will be easier to track
changes in both of the moving specs.  Currently chan_gtalk is 
compatible with the latest gtalk/libjingle version, and chan_jingle
needs a lot of work.

Added:
    trunk/channels/chan_gtalk.c
      - copied, changed from r43184, team/mogorman/asterisk-jabber/channels/chan_gtalk.c
    trunk/configs/gtalk.conf.sample
      - copied unchanged from r43184, team/mogorman/asterisk-jabber/configs/gtalk.conf.sample
Modified:
    trunk/   (props changed)
    trunk/channels/chan_jingle.c
    trunk/doc/jingle.txt

Propchange: trunk/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-43181

Copied: trunk/channels/chan_gtalk.c (from r43184, team/mogorman/asterisk-jabber/channels/chan_gtalk.c)
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?p2=trunk/channels/chan_gtalk.c&p1=team/mogorman/asterisk-jabber/channels/chan_gtalk.c&r1=43184&r2=43185&rev=43185&view=diff
==============================================================================
--- team/mogorman/asterisk-jabber/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Mon Sep 18 11:36:14 2006
@@ -20,7 +20,7 @@
  *
  * \author Matt O'Gorman <mogorman at digium.com>
  *
- * \brief Gtalk Channel Driver
+ * \brief Gtalk Channel Driver, until google/libjingle works with jingle spec
  * 
  * \ingroup channel_drivers
  */

Modified: trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_jingle.c?rev=43185&r1=43184&r2=43185&view=diff
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Mon Sep 18 11:36:14 2006
@@ -156,7 +156,7 @@
 };
 
 struct jingle_container {
-        ASTOBJ_CONTAINER_COMPONENTS(struct jingle);
+	ASTOBJ_CONTAINER_COMPONENTS(struct jingle);
 };
 
 static const char desc[] = "Jingle Channel";
@@ -521,7 +521,7 @@
 					"unsupported-dtmf-method xmlns='http://jabber.org/protocol/jingle/info/dtmf#errors'");
 			return -1;
 		}
-		if ((dtmfnode  = iks_find(pak->x, "dtmf"))) {
+		if ((dtmfnode = iks_find(pak->x, "dtmf"))) {
 			if((dtmf = iks_find_attrib(dtmfnode, "code"))) {
 				if(iks_find_with_attrib(pak->x, "dtmf", "action", "button-up")) {
 					struct ast_frame f = {AST_FRAME_DTMF_BEGIN, };
@@ -995,7 +995,7 @@
 	struct jingle_pvt *p = NULL, *tmp = NULL;
 	struct aji_client *c = client->connection;
 	struct jingle_candidate *newcandidate = NULL;
-	iks  *traversenodes = NULL, *receipt = NULL;
+	iks *traversenodes = NULL, *receipt = NULL;
 	newcandidate = ast_calloc(1, sizeof(*newcandidate));
 	if (!newcandidate)
 		return 0;
@@ -1533,7 +1533,7 @@
 				member->connection = client;
 				iks_filter_add_rule(client->f, jingle_parser, member, IKS_RULE_TYPE,
 									IKS_PAK_IQ, IKS_RULE_FROM_PARTIAL, member->user,
-									IKS_RULE_NS, "http://www.google.com/session",
+									IKS_RULE_NS, "http://jabber.org/protocol/jingle",
 									IKS_RULE_DONE);
 			} else {
 				ast_log(LOG_ERROR, "connection referenced not found!\n");
@@ -1640,7 +1640,7 @@
 						ASTOBJ_WRLOCK(member);
 						member->connection = iterator;
 						iks_filter_add_rule(iterator->f, jingle_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS,
-										"http://www.google.com/session", IKS_RULE_DONE);
+										"http://jabber.org/protocol/jingle", IKS_RULE_DONE);
 						ASTOBJ_UNLOCK(member);
 						ASTOBJ_CONTAINER_LINK(&jingles, member);
 						ASTOBJ_UNLOCK(iterator);
@@ -1715,9 +1715,9 @@
 			ASTOBJ_WRLOCK(iterator);
 			privates = iterator->p;
 			while(privates) {
-			    if (privates->owner)
-			        ast_softhangup(privates->owner, AST_SOFTHANGUP_APPUNLOAD);
-			    privates = privates->next;
+				if (privates->owner)
+					ast_softhangup(privates->owner, AST_SOFTHANGUP_APPUNLOAD);
+				privates = privates->next;
 			}
 			iterator->p = NULL;
 			ASTOBJ_UNLOCK(iterator);

Modified: trunk/doc/jingle.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/jingle.txt?rev=43185&r1=43184&r2=43185&view=diff
==============================================================================
--- trunk/doc/jingle.txt (original)
+++ trunk/doc/jingle.txt Mon Sep 18 11:36:14 2006
@@ -1,8 +1,10 @@
 (Jingle support in asterisk is experimental)
 Jingle is an xmpp based protocol for signalling the transfer of media.
 Currently asterisk supports the proprietary GoogleTalk protocol that is
-very similar to jingle, and hopes to support true jingle specs
+very similar to jingle, and hopes to soon support true jingle specs
 (JEP-166,167,176,177,180,181 etc) as more clients support the true standard.
 Jingle's configuration is very similar to sip.conf only as we are not the
 jabber server in this case you must provide a connection for the peer to
 travel out on.
+chan_gtalk is for supporting the non-jingle google/libjingle spec and 
+chan_jingle will continue to move in the direction of the correct spec.