[asterisk-commits] phsultan: trunk r82314 - in /trunk: channels/ include/asterisk/

[SVN commits to the Asterisk project]

Author: phsultan
Date: Thu Sep 13 10:05:16 2007
New Revision: 82314

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82314
Log:
Changed Jingle and Jingle DTMF namespaces.

As both specifications are in the Experimental status, the namespaces
specified therein shall be of the form
"http://www.xmpp.org/extensions/xep-XXXX.html#ns".

See the Namespace issuance section in XEP-0053 :
http://www.xmpp.org/extensions/xep-0053.html#namespaces

Modified:
    trunk/channels/chan_jingle.c
    trunk/include/asterisk/jingle.h

Modified: trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_jingle.c?view=diff&rev=82314&r1=82313&r2=82314
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Thu Sep 13 10:05:16 2007
@@ -367,7 +367,7 @@
 		iks_insert_attrib(iq, "id", client->connection->mid);
 		ast_aji_increment_mid(client->connection->mid);
 
-		iks_insert_attrib(jingle, "xmlns", "http://www.google.com/session");
+		iks_insert_attrib(jingle, "xmlns", GOOGLE_NS);
 		iks_insert_attrib(jingle, "type", JINGLE_ACCEPT);
 		iks_insert_attrib(jingle, "initiator",
 						  p->initiator ? client->connection->jid->full : p->from);
@@ -525,7 +525,7 @@
 		if(iks_find_with_attrib(pak->x, "dtmf-method", "method", "rtp")) {
 			jingle_response(client,pak,
 					"feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'",
-					"unsupported-dtmf-method xmlns='http://jabber.org/protocol/jingle/info/dtmf#errors'");
+					"unsupported-dtmf-method xmlns='http://www.xmpp.org/extensions/xep-0181.html#ns-errors'");
 			return -1;
 		}
 		if ((dtmfnode = iks_find(pak->x, "dtmf"))) {
@@ -861,7 +861,7 @@
 			iks_insert_attrib(session, "id", p->sid);
 			iks_insert_attrib(session, "initiator",
 							  p->initiator ? client->connection->jid->full : p->from);
-			iks_insert_attrib(session, "xmlns", "http://www.google.com/session");
+			iks_insert_attrib(session, "xmlns", GOOGLE_NS);
 			iks_insert_node(request, session);
 			iks_send(client->connection->p, request);
 			iks_delete(session);
@@ -1220,11 +1220,11 @@
 	iks_insert_attrib(iq, "from", client->connection->jid->full);
 	iks_insert_attrib(iq, "id", client->connection->mid);
 	ast_aji_increment_mid(client->connection->mid);
-	iks_insert_attrib(jingle, "xmlns", "http://jabber.org/protocol/jingle");
+	iks_insert_attrib(jingle, "xmlns", JINGLE_NS);
 	iks_insert_attrib(jingle, "action", "session-info");
 	iks_insert_attrib(jingle, "initiator", p->initiator ? client->connection->jid->full : p->from);
 	iks_insert_attrib(jingle, "sid", p->sid);
-	iks_insert_attrib(dtmf, "xmlns", "http://jabber.org/protocol/jingle/info/dtmf");
+	iks_insert_attrib(dtmf, "xmlns", JINGLE_DTMF_NS);
 	iks_insert_attrib(dtmf, "code", buffer);
 	iks_insert_node(iq, jingle);
 	iks_insert_node(jingle, dtmf);
@@ -1279,7 +1279,7 @@
 	iks_insert_attrib(session, "type", "initiate");
 	iks_insert_attrib(session, "id", p->sid);
 	iks_insert_attrib(session, "initiator", client->jid->full);
-	iks_insert_attrib(session, "xmlns", "http://www.google.com/session");
+	iks_insert_attrib(session, "xmlns", GOOGLE_NS);
 	iks_insert_attrib(desc, "xmlns", "http://www.google.com/session/phone");
 	payload_pcmu = iks_new("payload-type");
 	iks_insert_attrib(payload_pcmu, "id", "0");

Modified: trunk/include/asterisk/jingle.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/jingle.h?view=diff&rev=82314&r1=82313&r2=82314
==============================================================================
--- trunk/include/asterisk/jingle.h (original)
+++ trunk/include/asterisk/jingle.h Thu Sep 13 10:05:16 2007
@@ -37,7 +37,9 @@
 #define JINGLE_NODE "jingle"
 #define GOOGLE_NODE "session"
 
-#define JINGLE_NS "http://jabber.org/protocol/jingle"
+#define JINGLE_NS "http://www.xmpp.org/extensions/xep-0166.html#ns"
+#define JINGLE_DTMF_NS "http://www.xmpp.org/extensions/xep-0181.html#ns"
+#define JINGLE_DTMF_NS_ERROR "http://www.xmpp.org/extensions/xep-0181.html#ns"
 #define GOOGLE_NS "http://www.google.com/session"
 
 #define JINGLE_SID "sid"