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
|
|
@ -106,21 +106,9 @@ class XEP_0234(object):
|
|||
|
||||
# generic methods
|
||||
|
||||
def buildFileElement(
|
||||
self,
|
||||
name,
|
||||
file_hash=None,
|
||||
hash_algo=None,
|
||||
size=None,
|
||||
mime_type=None,
|
||||
desc=None,
|
||||
modified=None,
|
||||
transfer_range=None,
|
||||
path=None,
|
||||
namespace=None,
|
||||
file_elt=None,
|
||||
**kwargs
|
||||
):
|
||||
def buildFileElement(self, name, file_hash=None, hash_algo=None, size=None,
|
||||
mime_type=None, desc=None, modified=None, transfer_range=None, path=None,
|
||||
namespace=None, file_elt=None, **kwargs):
|
||||
"""Generate a <file> element with available metadata
|
||||
|
||||
@param file_hash(unicode, None): hash of the file
|
||||
|
|
|
|||
Loading…
Reference in a new issue