[asterisk-commits] dbrooks: branch dbrooks/jinglegtalkwork r179215 - /team/dbrooks/jinglegtalkwo...

[SVN commits to the Asterisk project]

Author: dbrooks
Date: Fri Feb 27 18:03:09 2009
New Revision: 179215

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179215
Log:
This branch is for jingle and gtalk work.


Modified:
    team/dbrooks/jinglegtalkwork/channels/chan_gtalk.c

Modified: team/dbrooks/jinglegtalkwork/channels/chan_gtalk.c
URL: http://svn.digium.com/svn-view/asterisk/team/dbrooks/jinglegtalkwork/channels/chan_gtalk.c?view=diff&rev=179215&r1=179214&r2=179215
==============================================================================
--- team/dbrooks/jinglegtalkwork/channels/chan_gtalk.c (original)
+++ team/dbrooks/jinglegtalkwork/channels/chan_gtalk.c Fri Feb 27 18:03:09 2009
@@ -649,11 +649,11 @@
 	}
 
 	/* codec points to the first <payload-type/> tag */
-	codec = iks_child(iks_child(iks_child(pak->x)));
+	codec = iks_first_tag(iks_first_tag(iks_first_tag(pak->x)));
 	while (codec) {
 		ast_rtp_set_m_type(tmp->rtp, atoi(iks_find_attrib(codec, "id")));
 		ast_rtp_set_rtpmap_type(tmp->rtp, atoi(iks_find_attrib(codec, "id")), "audio", iks_find_attrib(codec, "name"), 0);
-		codec = iks_next(codec);
+		codec = iks_next_tag(codec);
 	}
 	
 	/* Now gather all of the codecs that we are asked for */
@@ -1224,12 +1224,12 @@
 	}
 
 	/* codec points to the first <payload-type/> tag */	
-	codec = iks_child(iks_child(iks_child(pak->x)));
+	codec = iks_first_tag(iks_first_tag(iks_first_tag(pak->x)));
 	
 	while (codec) {
 		ast_rtp_set_m_type(p->rtp, atoi(iks_find_attrib(codec, "id")));
 		ast_rtp_set_rtpmap_type(p->rtp, atoi(iks_find_attrib(codec, "id")), "audio", iks_find_attrib(codec, "name"), 0);
-		codec = iks_next(codec);
+		codec = iks_next_tag(codec);
 	}
 	
 	/* Now gather all of the codecs that we are asked for */
@@ -1343,11 +1343,11 @@
 	traversenodes = pak->query;
 	while(traversenodes) {
 		if(!strcasecmp(iks_name(traversenodes), "session")) {
-			traversenodes = iks_child(traversenodes);
+			traversenodes = iks_first_tag(traversenodes);
 			continue;
 		}
 		if(!strcasecmp(iks_name(traversenodes), "transport")) {
-			traversenodes = iks_child(traversenodes);
+			traversenodes = iks_first_tag(traversenodes);
 			continue;
 		}
 		if(!strcasecmp(iks_name(traversenodes), "candidate")) {
@@ -1386,7 +1386,7 @@
 			gtalk_update_stun(p->parent, p);
 			newcandidate = NULL;
 		}
-		traversenodes = iks_next(traversenodes);
+		traversenodes = iks_next_tag(traversenodes);
 	}
 	
 	receipt = iks_new("iq");