plugins (jingle) file transfer: use initial "from" attribute as local jid instead of client.jid:
while client.jid is fine in a client context, for components it's not the right jid to use: it is the jid of the component itself while the file transfer/jingle session entity may be established with this jid + a local part (e.g. if client is files.example.net, session may be established with louise@files.example.net, in which case "from" is louise@files.example.net, while client.jid will be files.example.net). As a consequence, using client.jid was causing trouble with components. This patch fixes it for jingle and plugins linked to file transfer by keeping a "local_jid" variable in the session, where the jid from the original "from" attribute is used.
This commit is contained in:
parent
cad0d4b0e2
commit
a3c67e1072
1 changed files with 75 additions and 53 deletions
|
|
@ -84,17 +84,19 @@ class XEP_0261(object):
|
|||
elif action in (self._j.A_SESSION_INITIATE, self._j.A_TRANSPORT_REPLACE):
|
||||
transport_data["sid"] = transport_elt["sid"]
|
||||
elif action in (self._j.A_START, self._j.A_PREPARE_RESPONDER):
|
||||
local_jid = session["local_jid"]
|
||||
peer_jid = session["peer_jid"]
|
||||
sid = transport_data["sid"]
|
||||
stream_object = content_data["stream_object"]
|
||||
if action == self._j.A_START:
|
||||
block_size = transport_data["block_size"]
|
||||
d = self._ibb.startStream(
|
||||
client, stream_object, peer_jid, sid, block_size
|
||||
client, stream_object, local_jid, peer_jid, sid, block_size
|
||||
)
|
||||
d.chainDeferred(content_data["finished_d"])
|
||||
else:
|
||||
d = self._ibb.createSession(client, stream_object, peer_jid, sid)
|
||||
d = self._ibb.createSession(
|
||||
client, stream_object, local_jid, peer_jid, sid)
|
||||
d.chainDeferred(content_data["finished_d"])
|
||||
else:
|
||||
log.warning(u"FIXME: unmanaged action {}".format(action))
|
||||
|
|
|
|||
Loading…
Reference in a new issue