copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix sending candidates and computing hash in jingle file transfer. Fixes #7669

This commit is contained in:
Yann Leboulanger 2014-04-25 12:48:39 +02:00
parent ee4e161dc8
commit e9dd691645
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/jingle_ft.py
View File

@ -110,7 +110,7 @@ class JingleFileTransfer(JingleContent):
STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_TRANSPORT_REPLACE : StateTransportReplace(self),
STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self)
} }
if jingle_xtls.PYOPENSSL_PRESENT: if jingle_xtls.PYOPENSSL_PRESENT:
cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'],
jingle_xtls.SELF_SIGNED_CERTIFICATE) jingle_xtls.SELF_SIGNED_CERTIFICATE)

2
src/common/jingle_transport.py
View File

@ -69,7 +69,7 @@ class JingleTransport(object):
candidates is None) candidates is None)
""" """
if not candidates: if not candidates:
candidates = self._iter_candidates() candidates = list(self._iter_candidates())
else: else:
candidates = (self.make_candidate(candidate) for candidate in candidates) candidates = (self.make_candidate(candidate) for candidate in candidates)
transport = nbxmpp.Node('transport', payload=candidates) transport = nbxmpp.Node('transport', payload=candidates)