comparison src/plugins/plugin_xep_0261.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 cbfbe028d099
children c668081eba1c
comparison
equal deleted inserted replaced
1566:ec3848916ee8 1567:268fda4236ca
72 if action in (self._j.A_SESSION_ACCEPT, self._j.A_ACCEPTED_ACK): 72 if action in (self._j.A_SESSION_ACCEPT, self._j.A_ACCEPTED_ACK):
73 pass 73 pass
74 elif action == self._j.A_SESSION_INITIATE: 74 elif action == self._j.A_SESSION_INITIATE:
75 transport_data['sid'] = transport_elt['sid'] 75 transport_data['sid'] = transport_elt['sid']
76 elif action in (self._j.A_START, self._j.A_PREPARE_RESPONDER): 76 elif action in (self._j.A_START, self._j.A_PREPARE_RESPONDER):
77 to_jid = session['to_jid'] 77 peer_jid = session['peer_jid']
78 sid = transport_data['sid'] 78 sid = transport_data['sid']
79 file_obj = content_data['file_obj'] 79 file_obj = content_data['file_obj']
80 args = [session, content_name, profile] 80 args = [session, content_name, profile]
81 if action == self._j.A_START: 81 if action == self._j.A_START:
82 block_size = transport_data['block_size'] 82 block_size = transport_data['block_size']
83 d = self._ibb.startStream(file_obj, to_jid, sid, block_size, profile) 83 d = self._ibb.startStream(file_obj, peer_jid, sid, block_size, profile)
84 d.addErrback(self._streamEb, *args) 84 d.addErrback(self._streamEb, *args)
85 else: 85 else:
86 d = self._ibb.createSession(file_obj, to_jid, sid, profile) 86 d = self._ibb.createSession(file_obj, peer_jid, sid, profile)
87 d.addCallbacks(self._streamCb, self._streamEb, args, None, args) 87 d.addCallbacks(self._streamCb, self._streamEb, args, None, args)
88 else: 88 else:
89 log.warning(u"FIXME: unmanaged action {}".format(action)) 89 log.warning(u"FIXME: unmanaged action {}".format(action))
90 return transport_elt 90 return transport_elt
91 91