[telepathy-gabble/master] Prefer gtalk-p2p to iceudp
Will Thompson
will.thompson at collabora.co.uk
Mon Jun 29 03:54:29 PDT 2009
---
src/media-channel.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/media-channel.c b/src/media-channel.c
index f5835b4..07ee388 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1462,17 +1462,18 @@ _pick_best_resource (GabbleMediaChannel *chan,
return NULL;
CHOOSE_TRANSPORT:
- /* We prefer ICE, Google-P2P, then raw UDP */
+ /* We prefer gtalk-p2p to ice, because it can use tcp and https relays (if
+ * available). */
if (gabble_presence_resource_has_caps (presence, resource,
- PRESENCE_CAP_JINGLE_TRANSPORT_ICEUDP))
+ PRESENCE_CAP_GOOGLE_TRANSPORT_P2P))
{
- *transport_ns = NS_JINGLE_TRANSPORT_ICEUDP;
+ *transport_ns = NS_GOOGLE_TRANSPORT_P2P;
}
else if (gabble_presence_resource_has_caps (presence, resource,
- PRESENCE_CAP_GOOGLE_TRANSPORT_P2P))
+ PRESENCE_CAP_JINGLE_TRANSPORT_ICEUDP))
{
- *transport_ns = NS_GOOGLE_TRANSPORT_P2P;
+ *transport_ns = NS_JINGLE_TRANSPORT_ICEUDP;
}
else if (gabble_presence_resource_has_caps (presence, resource,
PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP))
--
1.5.6.5
More information about the telepathy-commits
mailing list