summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-01-26 16:53:50 -0800
committerLance Stout <lancestout@gmail.com>2014-01-26 16:53:50 -0800
commit848e6ebd8329b8e3fec4d770794361b39d2aaa69 (patch)
tree339bcfc98642c5dbcd2e15508f48f4484d30ea55 /sleekxmpp
parentd002d4c06fd90f5c6c0ddb38c0a38efc8fefd9ea (diff)
parentf76524fc9f6724c1013cd1d994dd7da813d8d61c (diff)
downloadslixmpp-848e6ebd8329b8e3fec4d770794361b39d2aaa69.tar.gz
slixmpp-848e6ebd8329b8e3fec4d770794361b39d2aaa69.tar.bz2
slixmpp-848e6ebd8329b8e3fec4d770794361b39d2aaa69.tar.xz
slixmpp-848e6ebd8329b8e3fec4d770794361b39d2aaa69.zip
Merge pull request #275 from waechtjn/develop
XEP-0065 Implementation Broken
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0065/proxy.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py
index 265d3030..fdd9f97e 100644
--- a/sleekxmpp/plugins/xep_0065/proxy.py
+++ b/sleekxmpp/plugins/xep_0065/proxy.py
@@ -88,8 +88,9 @@ class XEP_0065(base_plugin):
# Request that the proxy activate the session with the target.
self.activate(proxy, sid, to, timeout=timeout)
- self.xmpp.event('stream:%s:%s' % (sid, conn.peer_jid), conn)
- return self.get_socket(sid)
+ socket = self.get_socket(sid)
+ self.xmpp.event('stream:%s:%s' % (sid, to), socket)
+ return socket
def request_stream(self, to, sid=None, ifrom=None, block=True, timeout=None, callback=None):
if sid is None:
@@ -198,11 +199,16 @@ class XEP_0065(base_plugin):
sock = self._sessions.get(sid)
if sock:
try:
+ # sock.close() will also delete sid from self._sessions (see _connect_proxy)
sock.close()
except socket.error:
pass
+ # Though this should not be neccessary remove the closed session anyway
with self._sessions_lock:
- del self._sessions[sid]
+ if sid in self._sessions:
+ log.warn(('SOCKS5 session with sid = "%s" was not ' +
+ 'removed from _sessions by sock.close()') % sid)
+ del self._sessions[sid]
def close(self):
"""Closes all proxy sockets."""
@@ -250,6 +256,7 @@ class XEP_0065(base_plugin):
if sid in self._sessions:
del self._sessions[sid]
_close()
+ log.info('Socket closed.')
sock.close = close
sock.peer_jid = peer