diff src/plugins/plugin_xep_0260.py @ 1567:268fda4236ca

plugins XE0166, XEP-0234, XEP-0260, XEP-0261: renamed session key managing other peer's jid to "peer_jid" instead of "to_jid"
author Goffi <goffi@goffi.org>
date Sun, 08 Nov 2015 14:44:33 +0100
parents dcce63810733
children 37d4be4a9fed
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0260.py	Sun Nov 08 14:44:30 2015 +0100
+++ b/src/plugins/plugin_xep_0260.py	Sun Nov 08 14:44:33 2015 +0100
@@ -120,7 +120,7 @@
         content_data = session['contents'][content_name]
         transport_data = content_data['transport_data']
         sid = transport_data['sid'] = unicode(uuid.uuid4())
-        session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(client.jid, session['to_jid'], sid)
+        session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(client.jid, session['peer_jid'], sid)
         candidates = transport_data['candidates'] = yield self._s5b.getCandidates(profile)
         mode = 'tcp' # XXX: we only manage tcp for now
         transport_elt = self._buildCandidates(session, candidates, sid, session_hash, client, mode)
@@ -239,7 +239,7 @@
             # and we give our candidates
             assert 'peer_candidates' not in transport_data
             sid = transport_data['sid'] = transport_elt['sid']
-            session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(session['to_jid'], client.jid, sid)
+            session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(session['peer_jid'], client.jid, sid)
             peer_candidates = transport_data['peer_candidates'] = self._parseCandidates(transport_elt)
             file_obj = content_data['file_obj']
             stream_d = self._s5b.registerHash(session_hash, file_obj, profile)