Mercurial > libervia-backend

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1566:ec3848916ee8 1567:268fda4236ca
118 def jingleSessionInit(self, session, content_name, profile): 118 def jingleSessionInit(self, session, content_name, profile):
119 client = self.host.getClient(profile) 119 client = self.host.getClient(profile)
120 content_data = session['contents'][content_name] 120 content_data = session['contents'][content_name]
121 transport_data = content_data['transport_data'] 121 transport_data = content_data['transport_data']
122 sid = transport_data['sid'] = unicode(uuid.uuid4()) 122 sid = transport_data['sid'] = unicode(uuid.uuid4())
123 session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(client.jid, session['to_jid'], sid) 123 session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(client.jid, session['peer_jid'], sid)
124 candidates = transport_data['candidates'] = yield self._s5b.getCandidates(profile) 124 candidates = transport_data['candidates'] = yield self._s5b.getCandidates(profile)
125 mode = 'tcp' # XXX: we only manage tcp for now 125 mode = 'tcp' # XXX: we only manage tcp for now
126 transport_elt = self._buildCandidates(session, candidates, sid, session_hash, client, mode) 126 transport_elt = self._buildCandidates(session, candidates, sid, session_hash, client, mode)
127 127
128 defer.returnValue(transport_elt) 128 defer.returnValue(transport_elt)
237 elif action == self._j.A_SESSION_INITIATE: 237 elif action == self._j.A_SESSION_INITIATE:
238 # responder side, we select a candidate in the ones sent by initiator 238 # responder side, we select a candidate in the ones sent by initiator
239 # and we give our candidates 239 # and we give our candidates
240 assert 'peer_candidates' not in transport_data 240 assert 'peer_candidates' not in transport_data
241 sid = transport_data['sid'] = transport_elt['sid'] 241 sid = transport_data['sid'] = transport_elt['sid']
242 session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(session['to_jid'], client.jid, sid) 242 session_hash = transport_data['session_hash'] = self._s5b.getSessionHash(session['peer_jid'], client.jid, sid)
243 peer_candidates = transport_data['peer_candidates'] = self._parseCandidates(transport_elt) 243 peer_candidates = transport_data['peer_candidates'] = self._parseCandidates(transport_elt)
244 file_obj = content_data['file_obj'] 244 file_obj = content_data['file_obj']
245 stream_d = self._s5b.registerHash(session_hash, file_obj, profile) 245 stream_d = self._s5b.registerHash(session_hash, file_obj, profile)
246 args = [session, content_name, profile] 246 args = [session, content_name, profile]
247 stream_d.addCallbacks(self._streamCb, self._streamEb, args, None, args) 247 stream_d.addCallbacks(self._streamCb, self._streamEb, args, None, args)