From e9dd69164540f6532a1d6c21f605e01ca9c20020 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 25 Apr 2014 12:48:39 +0200 Subject: [PATCH] fix sending candidates and computing hash in jingle file transfer. Fixes #7669 --- src/common/jingle_ft.py | 2 +- src/common/jingle_transport.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/jingle_ft.py b/src/common/jingle_ft.py index 5412d8b4e..0e2bc7eff 100644 --- a/src/common/jingle_ft.py +++ b/src/common/jingle_ft.py @@ -110,7 +110,7 @@ class JingleFileTransfer(JingleContent): STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } - + if jingle_xtls.PYOPENSSL_PRESENT: cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], jingle_xtls.SELF_SIGNED_CERTIFICATE) diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py index 7ff7b91fc..afd8969ee 100644 --- a/src/common/jingle_transport.py +++ b/src/common/jingle_transport.py @@ -69,7 +69,7 @@ class JingleTransport(object): candidates is None) """ if not candidates: - candidates = self._iter_candidates() + candidates = list(self._iter_candidates()) else: candidates = (self.make_candidate(candidate) for candidate in candidates) transport = nbxmpp.Node('transport', payload=candidates)