changeset 3c14a927ee34 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3c14a927ee34 description: close FT port as soon as we know it won't be used for the transfer.

diffstat:

src/common/jingle_ft.py | 3 ++- src/common/jingle_ftstates.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r bfcd83790200 -r 3c14a927ee34 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun Jun 01 22:32:44 2014 +0200 +++ b/src/common/jingle_ft.py Mon Jun 16 21:32:01 2014 +0200 @@ -282,7 +282,8 @@ streamhost_used = cand break 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() if content.getTag('transport').getTag('activated'): self.state = STATE_TRANSFERING diff -r bfcd83790200 -r 3c14a927ee34 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Sun Jun 01 22:32:44 2014 +0200 +++ b/src/common/jingle_ftstates.py Mon Jun 16 21:32:01 2014 +0200 @@ -151,9 +151,13 @@ if self.jft.isOurCandUsed(): mode = 'client' streamhost_used = self.jft.nominated_cand['our-cand'] + gajim.socks5queue.remove_server(self.jft.file_props.sid) else: mode = 'server' 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': self.jft.file_props.is_a_proxy = True if self.jft.file_props.type_ == 's' and self.jft.weinitiate: