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

don't use XTLS to transfer files when we don't use the security element

Browse source
This commit is contained in:
Yann Leboulanger 2010-08-24 23:24:18 +02:00
parent b8914c6219
commit 556236ac38
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/jingle_ft.py
View file

@ -204,9 +204,12 @@ class JingleFileTransfer(JingleContent):
port = gajim.config.get('file_transfers_port') port = gajim.config.get('file_transfers_port')
fingerprint = None
if self.use_security:
fingerprint = 'server'
listener = gajim.socks5queue.start_listener(port, sha_str, listener = gajim.socks5queue.start_listener(port, sha_str,
self._store_socks5_sid, self.file_props['sid'], self._store_socks5_sid, self.file_props['sid'],
fingerprint='server') fingerprint=fingerprint)
if not listener: if not listener:
return return
@ -218,9 +221,12 @@ class JingleFileTransfer(JingleContent):
self.session.connection.name, self.file_props['sid']): self.session.connection.name, self.file_props['sid']):
gajim.socks5queue.add_file_props(self.session.connection.name, gajim.socks5queue.add_file_props(self.session.connection.name,
self.file_props) self.file_props)
fingerprint = None
if self.use_security:
fingerprint = 'client'
gajim.socks5queue.connect_to_hosts(self.session.connection.name, gajim.socks5queue.connect_to_hosts(self.session.connection.name,
self.file_props['sid'], self.send_candidate_used, self.file_props['sid'], self.send_candidate_used,
self._on_connect_error, fingerprint='client') self._on_connect_error, fingerprint=fingerprint)
elif not self.weinitiate and self.state == STATE_ACCEPTED: elif not self.weinitiate and self.state == STATE_ACCEPTED:
# transport-info iq-result # transport-info iq-result
self.state = STATE_TRANSPORT_INFO self.state = STATE_TRANSPORT_INFO