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

close FT port as soon as we know it won't be used for the transfer.

Browse source
This commit is contained in:
Yann Leboulanger 2014-06-16 21:32:01 +02:00
parent d026f79428
commit ffaa6efbc7
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/jingle_ft.py
View file

@ -282,7 +282,8 @@ class JingleFileTransfer(JingleContent):
streamhost_used = cand streamhost_used = cand
break break
if streamhost_used == None or streamhost_used['type'] == 'proxy': if streamhost_used == None or streamhost_used['type'] == 'proxy':
if not gajim.socks5queue.listener.connections: if gajim.socks5queue.listener and \
not gajim.socks5queue.listener.connections:
gajim.socks5queue.listener.disconnect() gajim.socks5queue.listener.disconnect()
if content.getTag('transport').getTag('activated'): if content.getTag('transport').getTag('activated'):
self.state = STATE_TRANSFERING self.state = STATE_TRANSFERING

4
src/common/jingle_ftstates.py
View file

@ -151,9 +151,13 @@ class StateTransfering(JingleFileTransferStates):
if self.jft.isOurCandUsed(): if self.jft.isOurCandUsed():
mode = 'client' mode = 'client'
streamhost_used = self.jft.nominated_cand['our-cand'] streamhost_used = self.jft.nominated_cand['our-cand']
gajim.socks5queue.remove_server(self.jft.file_props.sid)
else: else:
mode = 'server' mode = 'server'
streamhost_used = self.jft.nominated_cand['peer-cand'] streamhost_used = self.jft.nominated_cand['peer-cand']
gajim.socks5queue.remove_client(self.jft.file_props.sid)
# our_cand = self.jft.nominated_cand['our-cand']
# gajim.socks5queue.remove_receiver(our_cand['idx'])
if streamhost_used['type'] == 'proxy': if streamhost_used['type'] == 'proxy':
self.jft.file_props.is_a_proxy = True self.jft.file_props.is_a_proxy = True
if self.jft.file_props.type_ == 's' and self.jft.weinitiate: if self.jft.file_props.type_ == 's' and self.jft.weinitiate: