From 3c5514262c500043fe1965e2de70875d20f54b6b Mon Sep 17 00:00:00 2001 From: phsultan Date: Wed, 28 May 2008 14:13:16 +0000 Subject: Merged revisions 118644 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r118644 | phsultan | 2008-05-28 16:10:48 +0200 (Wed, 28 May 2008) | 10 lines Changed to temporary namespaces to match with latest XEPs. As soon as Jingle is completely standardized, we can set those namespaces to their final values. Added two attributes to the jingle_pvt struct to store the content name attributes. Reported by Robert McQueen on Telepathy's framework mailing list : http://lists.freedesktop.org/archives/telepathy/2008-May/001971.html Keeping working on our Jingle stack! ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@118645 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/jingle.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/asterisk/jingle.h b/include/asterisk/jingle.h index bc3b0f217..7442d9aca 100644 --- a/include/asterisk/jingle.h +++ b/include/asterisk/jingle.h @@ -37,11 +37,12 @@ #define JINGLE_NODE "jingle" #define GOOGLE_NODE "session" -#define JINGLE_NS "http://www.xmpp.org/extensions/xep-0166.html#ns" -#define JINGLE_AUDIO_RTP_NS "http://www.xmpp.org/extensions/xep-0167.html#ns" -#define JINGLE_ICE_UDP_NS "http://www.xmpp.org/extensions/xep-0176.html#ns-udp" -#define JINGLE_DTMF_NS "http://www.xmpp.org/extensions/xep-0181.html#ns" -#define JINGLE_DTMF_NS_ERRORS "http://www.xmpp.org/extensions/xep-0181.html#ns-errors" +#define JINGLE_NS "urn:xmpp:tmp:jingle" +#define JINGLE_AUDIO_RTP_NS "urn:xmpp:tmp:jingle:apps:audio-rtp" +#define JINGLE_VIDEO_RTP_NS "urn:xmpp:tmp:jingle:apps:video" +#define JINGLE_ICE_UDP_NS "urn:xmpp:tmp:jingle:transports:ice-udp" +#define JINGLE_DTMF_NS "urn:xmpp:tmp:jingle:dtmf" + #define GOOGLE_NS "http://www.google.com/session" #define JINGLE_SID "sid" -- cgit v1.2.3