jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #275 from waechtjn/develop

Browse Source 
XEP-0065 Implementation Broken
This commit is contained in:
Lance Stout 2014-01-26 16:53:50 -08:00
commit 848e6ebd83
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sleekxmpp/plugins/xep_0065/proxy.py
View File

@ -88,8 +88,9 @@ class XEP_0065(base_plugin):
# Request that the proxy activate the session with the target. # Request that the proxy activate the session with the target.
self.activate(proxy, sid, to, timeout=timeout) self.activate(proxy, sid, to, timeout=timeout)
self.xmpp.event('stream:%s:%s' % (sid, conn.peer_jid), conn) socket = self.get_socket(sid)
return 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): def request_stream(self, to, sid=None, ifrom=None, block=True, timeout=None, callback=None):
if sid is None: if sid is None:
@ -198,11 +199,16 @@ class XEP_0065(base_plugin):
sock = self._sessions.get(sid) sock = self._sessions.get(sid)
if sock: if sock:
try: try:
# sock.close() will also delete sid from self._sessions (see _connect_proxy)
sock.close() sock.close()
except socket.error: except socket.error:
pass pass
# Though this should not be neccessary remove the closed session anyway
with self._sessions_lock: 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): def close(self):
"""Closes all proxy sockets.""" """Closes all proxy sockets."""
@ -250,6 +256,7 @@ class XEP_0065(base_plugin):
if sid in self._sessions: if sid in self._sessions:
del self._sessions[sid] del self._sessions[sid]
_close() _close()
log.info('Socket closed.')
sock.close = close sock.close = close
sock.peer_jid = peer sock.peer_jid = peer