[telepathy-gabble/master] Bump raw-udp and ice-udp namespaces to :1

Will Thompson will.thompson at collabora.co.uk
Thu Sep 10 06:32:51 PDT 2009


We never supported the <trying/> element, whose removal prompted the
namespace bump in raw-udp. The namespace bump in ice-udp is due to the
id='' attribute (which we support) and to keep the numbers the same
across Jingle specs.

There's no particularly pressing reason to support the old version: we
prefer to use gtalk-p2p if possible anyway, so we're
backwards-compatible with older Gabbles.

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
---
 src/namespaces.h    |    4 ++--
 tests/twisted/ns.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/namespaces.h b/src/namespaces.h
index e88513e..4750182 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -73,9 +73,9 @@
 /* google-p2p transport */
 #define NS_GOOGLE_TRANSPORT_P2P "http://www.google.com/transport/p2p"
 /* Jingle RAW-UDP transport */
-#define NS_JINGLE_TRANSPORT_RAWUDP "urn:xmpp:jingle:transports:raw-udp:0"
+#define NS_JINGLE_TRANSPORT_RAWUDP "urn:xmpp:jingle:transports:raw-udp:1"
 /* Jingle ICE-UDP transport */
-#define NS_JINGLE_TRANSPORT_ICEUDP "urn:xmpp:jingle:transports:ice-udp:0"
+#define NS_JINGLE_TRANSPORT_ICEUDP "urn:xmpp:jingle:transports:ice-udp:1"
 
 #define NS_MUC                  "http://jabber.org/protocol/muc"
 #define NS_MUC_BYTESTREAM       "http://telepathy.freedesktop.org/xmpp/protocol/muc-bytestream"
diff --git a/tests/twisted/ns.py b/tests/twisted/ns.py
index 8679787..8982d28 100644
--- a/tests/twisted/ns.py
+++ b/tests/twisted/ns.py
@@ -26,8 +26,8 @@ JINGLE_RTP_AUDIO = "urn:xmpp:jingle:apps:rtp:audio"
 JINGLE_RTP_VIDEO = "urn:xmpp:jingle:apps:rtp:video"
 JINGLE_RTP_ERRORS = "urn:xmpp:jingle:apps:rtp:errors:1"
 JINGLE_RTP_INFO_1 = "urn:xmpp:jingle:apps:rtp:info:1"
-JINGLE_TRANSPORT_ICEUDP = "urn:xmpp:jingle:transports:ice-udp:0"
-JINGLE_TRANSPORT_RAWUDP = "urn:xmpp:jingle:transports:raw-udp:0"
+JINGLE_TRANSPORT_ICEUDP = "urn:xmpp:jingle:transports:ice-udp:1"
+JINGLE_TRANSPORT_RAWUDP = "urn:xmpp:jingle:transports:raw-udp:1"
 MUC = 'http://jabber.org/protocol/muc'
 MUC_BYTESTREAM = 'http://telepathy.freedesktop.org/xmpp/protocol/muc-bytestream'
 MUC_OWNER = '%s#owner' % MUC
-- 
1.5.6.5




More information about the telepathy-commits mailing list