From b95532b68b33787deef606e3ffc13e7416858b28 Mon Sep 17 00:00:00 2001 From: waechtjn Date: Sun, 26 Jan 2014 16:48:31 +0100 Subject: Update xep_0065/proxy.py Removed reference to undefined variable "conn" --- sleekxmpp/plugins/xep_0065/proxy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py index 265d3030..eba7d1e9 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: -- cgit v1.2.3 From f76524fc9f6724c1013cd1d994dd7da813d8d61c Mon Sep 17 00:00:00 2001 From: waechtjn Date: Sun, 26 Jan 2014 16:53:53 +0100 Subject: Fixed XEP-0065 SOCKS5 socket closing SCOKS5 SID were removed multiple times from the _sessions dictionary --- sleekxmpp/plugins/xep_0065/proxy.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py index eba7d1e9..fdd9f97e 100644 --- a/sleekxmpp/plugins/xep_0065/proxy.py +++ b/sleekxmpp/plugins/xep_0065/proxy.py @@ -199,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.""" @@ -251,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 -- cgit v1.2.3