[telepathy-gabble/master] enable the new rawudp support
Senko Rasic
senko.rasic at collabora.co.uk
Mon Jun 29 04:43:01 PDT 2009
---
src/capabilities.c | 3 +--
src/jingle-factory.c | 2 ++
src/namespaces.h | 3 +--
src/types.h | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/capabilities.c b/src/capabilities.c
index daba292..50c2b91 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -39,6 +39,7 @@ static const Feature self_advertised_features[] =
{
{ FEATURE_FIXED, NS_GOOGLE_FEAT_SESSION, 0},
{ FEATURE_FIXED, NS_GOOGLE_TRANSPORT_P2P, PRESENCE_CAP_GOOGLE_TRANSPORT_P2P},
+ { FEATURE_FIXED, NS_JINGLE_TRANSPORT_RAWUDP, PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP},
{ FEATURE_FIXED, NS_JINGLE015, PRESENCE_CAP_JINGLE015},
{ FEATURE_FIXED, NS_JINGLE032, PRESENCE_CAP_JINGLE032},
{ FEATURE_FIXED, NS_CHAT_STATES, PRESENCE_CAP_CHAT_STATES},
@@ -61,8 +62,6 @@ static const Feature self_advertised_features[] =
{ FEATURE_OPTIONAL, NS_JINGLE_RTP_VIDEO, PRESENCE_CAP_JINGLE_RTP_VIDEO },
{ FEATURE_OPTIONAL, NS_JINGLE_TRANSPORT_ICE,
PRESENCE_CAP_JINGLE_TRANSPORT_ICE },
- { FEATURE_OPTIONAL, NS_JINGLE_TRANSPORT_RAWUDP,
- PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP },
{ FEATURE_OPTIONAL, NS_OLPC_BUDDY_PROPS "+notify", PRESENCE_CAP_OLPC_1},
{ FEATURE_OPTIONAL, NS_OLPC_ACTIVITIES "+notify", PRESENCE_CAP_OLPC_1},
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 51bb584..1a9db85 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -36,6 +36,7 @@
#include "jingle-media-rtp.h"
#include "jingle-session.h"
#include "jingle-transport-google.h"
+#include "jingle-transport-rawudp.h"
#include "namespaces.h"
#include "util.h"
@@ -526,6 +527,7 @@ gabble_jingle_factory_constructor (GType type,
jingle_media_rtp_register (self);
jingle_transport_google_register (self);
+ jingle_transport_rawudp_register (self);
return obj;
}
diff --git a/src/namespaces.h b/src/namespaces.h
index 5bb6fad..391154f 100644
--- a/src/namespaces.h
+++ b/src/namespaces.h
@@ -76,8 +76,7 @@
/* google-p2p transport */
#define NS_GOOGLE_TRANSPORT_P2P "http://www.google.com/transport/p2p"
/* Jingle RAW-UDP transport */
-#define NS_JINGLE_TRANSPORT_RAWUDP \
- "http://jabber.org/protocol/jingle/transport/rawudp"
+#define NS_JINGLE_TRANSPORT_RAWUDP "urn:xmpp:jingle:transports:raw-udp:0"
#define NS_MUC "http://jabber.org/protocol/muc"
#define NS_MUC_BYTESTREAM "http://telepathy.freedesktop.org/xmpp/protocol/muc-bytestream"
diff --git a/src/types.h b/src/types.h
index 864473d..f891417 100644
--- a/src/types.h
+++ b/src/types.h
@@ -47,6 +47,7 @@ typedef struct _GabbleJingleFactory GabbleJingleFactory;
typedef struct _GabbleJingleSession GabbleJingleSession;
typedef struct _GabbleJingleContent GabbleJingleContent;
typedef struct _GabbleJingleTransportGoogle GabbleJingleTransportGoogle;
+typedef struct _GabbleJingleTransportRawUdp GabbleJingleTransportRawUdp;
typedef struct _GabbleJingleMediaRtp GabbleJingleMediaRtp;
typedef struct _JingleCandidate JingleCandidate;
--
1.5.6.5
More information about the telepathy-commits
mailing list