summaryrefslogtreecommitdiff
path: root/src/bytestream-factory.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-12-04 11:38:25 +0000
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-12-07 10:43:05 +0000
commit7372e05b592298e4478d8f0f975dd72fe47e60d5 (patch)
tree9204a3f8e0a970120bf15eaaf2b389b79c213a51 /src/bytestream-factory.c
parent3a3de09a58072192e4423cfa0cf2c1a37bc08650 (diff)
downloadtelepathy-gabble-7372e05b592298e4478d8f0f975dd72fe47e60d5.tar.gz
streamhost are identified by their host
The SOCKS5 reply from the other peer only contains the jid of the streamhost. We can't have more than one proxy using the same jid as then we won't be able to know which one is used by the peer.
Diffstat (limited to 'src/bytestream-factory.c')
-rw-r--r--src/bytestream-factory.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index eebd9c0fe..0008ce4fb 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -218,18 +218,9 @@ cmp_proxy (gconstpointer a,
{
GabbleSocks5Proxy *proxy_a = (GabbleSocks5Proxy *) a;
GabbleSocks5Proxy *proxy_b = (GabbleSocks5Proxy *) b;
- gint result;
- result = strcmp (proxy_a->jid, proxy_b->jid);
- if (result != 0)
- return result;
-
- result = strcmp (proxy_a->host, proxy_b->host);
- if (result != 0)
- return result;
-
- result = strcmp (proxy_a->port, proxy_b->port);
- return result;
+ /* Streamhost are identified by their jid */
+ return strcmp (proxy_a->jid, proxy_b->jid);
}
static void