summaryrefslogtreecommitdiff
path: root/slixmpp/plugins/xep_0065/proxy.py
diff options
context:
space:
mode:
Diffstat (limited to 'slixmpp/plugins/xep_0065/proxy.py')
-rw-r--r--slixmpp/plugins/xep_0065/proxy.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/slixmpp/plugins/xep_0065/proxy.py b/slixmpp/plugins/xep_0065/proxy.py
index c5d358dd..3fe6d2d1 100644
--- a/slixmpp/plugins/xep_0065/proxy.py
+++ b/slixmpp/plugins/xep_0065/proxy.py
@@ -22,7 +22,7 @@ class XEP_0065(BasePlugin):
name = 'xep_0065'
description = "XEP-0065: SOCKS5 Bytestreams"
- dependencies = set(['xep_0030'])
+ dependencies = {'xep_0030'}
default_config = {
'auto_accept': False
}
@@ -55,6 +55,7 @@ class XEP_0065(BasePlugin):
"""Returns the socket associated to the SID."""
return self._sessions.get(sid, None)
+ @asyncio.coroutine
def handshake(self, to, ifrom=None, sid=None, timeout=None):
""" Starts the handshake to establish the socks5 bytestreams
connection.
@@ -104,6 +105,7 @@ class XEP_0065(BasePlugin):
iq['socks'].add_streamhost(proxy, host, port)
return iq.send(timeout=timeout, callback=callback)
+ @asyncio.coroutine
def discover_proxies(self, jid=None, ifrom=None, timeout=None):
"""Auto-discover the JIDs of SOCKS5 proxies on an XMPP server."""
if jid is None: