[asterisk-commits] branch mogorman/asterisk-xmpp r21035 - /team/mogorman/asterisk-xmpp/channels/

[asterisk-commits at lists.digium.com]

Author: markster
Date: Mon Apr 17 19:03:42 2006
New Revision: 21035

URL: http://svn.digium.com/view/asterisk?rev=21035&view=rev
Log:
it works or at least it thinks it works.

Modified:
    team/mogorman/asterisk-xmpp/channels/chan_jingle.c

Modified: team/mogorman/asterisk-xmpp/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/channels/chan_jingle.c?rev=21035&r1=21034&r2=21035&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/channels/chan_jingle.c (original)
+++ team/mogorman/asterisk-xmpp/channels/chan_jingle.c Mon Apr 17 19:03:42 2006
@@ -249,13 +249,12 @@
 	int x;
 	int pref_codec = 0;
 	int alreadysent = 0;
-	char mid[50];
 
 	iq = iks_new("iq");
 	jingle = iks_new(GOOGLE_NODE);
 	description = iks_new("description");
 	if (iq && jingle && description) {
-		iks_insert_attrib(description,"xmlns",GOOGLE_NS);
+		iks_insert_attrib(description,"xmlns","http://www.google.com/session/phone");
 
 		for (x = 0; x < 32; x++) {
 			if (!(pref_codec = ast_codec_pref_index(&client->prefs, x)))
@@ -273,25 +272,25 @@
 		payload_red= iks_new("payload-type");
 			iks_insert_attrib(payload_red,"id","117");
 			iks_insert_attrib(payload_red,"name","red");
-			iks_insert_attrib(payload_red,"xmlns",GOOGLE_NS);
+			iks_insert_attrib(payload_red,"xmlns","http://www.google.com/session/phone");
 		payload_audio= iks_new("payload-type");
 			iks_insert_attrib(payload_audio,"id","106");
 			iks_insert_attrib(payload_audio,"name","audio/telephone-event");
-			iks_insert_attrib(payload_audio,"xmlns",GOOGLE_NS);
+			iks_insert_attrib(payload_audio,"xmlns","http://www.google.com/session/phone");
 		payload_cn= iks_new("payload-type");
 			iks_insert_attrib(payload_cn,"id","13");
 			iks_insert_attrib(payload_cn,"name","CN");
-			iks_insert_attrib(payload_cn,"xmlns",GOOGLE_NS);
+			iks_insert_attrib(payload_cn,"xmlns","http://www.google.com/session/phone");
 			
 			
 			iks_insert_attrib(iq,"type","set");
-			iks_insert_attrib(iq,"from",c->jid->full);
+	//		iks_insert_attrib(iq,"from",client->connection->jid->full);
 			iks_insert_attrib(iq,"to",p->from);
-			snprintf(mid,sizeof(mid),"j:active:%s",tmp->sid);
-			iks_insert_attrib(iq,"id",mid);
+			iks_insert_attrib(iq,"id",client->connection->mid);
+			ast_aji_increment_mid(client->connection->mid);
 		
-			iks_insert_attrib(jingle, "xmlns", GOOGLE_NS);
-			iks_insert_attrib(jingle, "action", JINGLE_ACCEPT);
+			iks_insert_attrib(jingle, "xmlns", "http://www.google.com/session");
+			iks_insert_attrib(jingle, "type", JINGLE_ACCEPT);
 			iks_insert_attrib(jingle, "initiator", p->initiator ? client->connection->jid->full : p->from);
 			iks_insert_attrib(jingle, GOOGLE_SID, tmp->sid);
 			iks_insert_node(iq,jingle);