Commits June 2014

commits@gajim.org

1 participants
13 discussions

gajim: add new function to close socket
by Gajim 01 Jun '14

01 Jun '14

changeset 0e4a570e500b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0e4a570e500b description: add new function to close socket diffstat: src/common/socks5.py | 71 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 28 deletions(-) diffs (107 lines): diff -r e5b0abcf7d50 -r 0e4a570e500b src/common/socks5.py --- a/src/common/socks5.py Sun Jun 01 15:40:17 2014 +0200 +++ b/src/common/socks5.py Sun Jun 01 15:42:06 2014 +0200 @@ -365,6 +365,28 @@ elif self.progress_transfer_cb is not None: self.progress_transfer_cb(actor.account, actor.file_props) + def remove_receiver_by_key(self, key, do_disconnect=True): + reader = self.readers[key] + self.idlequeue.unplug_idle(reader.fd) + self.idlequeue.remove_timeout(reader.fd) + if do_disconnect: + reader.disconnect() + else: + if reader.streamhost is not None: + reader.streamhost['state'] = -1 + del(self.readers[key]) + + def remove_sender_by_key(self, key, do_disconnect=True): + sender = self.senders[key] + if do_disconnect: + sender.disconnect() + else: + self.idlequeue.unplug_idle(sender.fd) + self.idlequeue.remove_timeout(sender.fd) + del(self.senders[key]) + if self.connected > 0: + self.connected -= 1 + def remove_receiver(self, idx, do_disconnect=True, remove_all=False): """ Remove reciver from the list and decrease the number of active @@ -373,20 +395,10 @@ if idx != -1: for key in self.readers.keys(): if idx in key: - reader = self.readers[key] - self.idlequeue.unplug_idle(reader.fd) - self.idlequeue.remove_timeout(reader.fd) - if do_disconnect: - reader.disconnect() - del self.readers[key] - if not remove_all: - break - else: - if reader.streamhost is not None: - reader.streamhost['state'] = -1 - del(self.readers[key]) - if not remove_all: - break + self.remove_receiver_by_key(key, + do_disconnect=do_disconnect) + if not remove_all: + break def remove_sender(self, idx, do_disconnect=True, remove_all=False): """ @@ -396,24 +408,27 @@ if idx != -1: for key in self.senders.keys(): if idx in key: - sender = self.senders[key] - if do_disconnect: - sender.disconnect() - if not remove_all: - break - else: - self.idlequeue.unplug_idle(sender.fd) - self.idlequeue.remove_timeout(sender.fd) - del(self.senders[key]) - if self.connected > 0: - self.connected -= 1 - if not remove_all: - break + self.remove_sender_by_key(key, do_disconnect=do_disconnect) + if not remove_all: + break if len(self.senders) == 0 and self.listener is not None: self.listener.disconnect() self.listener = None self.connected -= 1 + def remove_by_mode(self, sid, mode, do_disconnect=True): + for (key, sock) in self.senders.items(): + if key[0] == sid and sock.mode == mode: + self.remove_sender_by_key(key) + for (key, sock) in self.readers.items(): + if key[0] == sid and sock.mode == mode: + self.remove_receiver_by_key(key) + + def remove_server(self, sid, do_disconnect=True): + self.remove_by_mode(sid, 'server') + + def remove_client(self, sid, do_disconnect=True): + self.remove_by_mode(sid, 'client') class Socks5(object): def __init__(self, idlequeue, host, port, initiator, target, sid): @@ -770,7 +785,7 @@ self.close_file() self.idlequeue.remove_timeout(self.fd) self.idlequeue.unplug_idle(self.fd) - if self.mode == 'server': + if self.mode == 'server' and self.queue.listener: try: self.queue.listener.connections.remove(self._sock) except ValueError:

1 0

gajim: correctly get account name
by Gajim 01 Jun '14

01 Jun '14

changeset 2f3fecd07d6a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2f3fecd07d6a description: correctly get account name diffstat: src/common/protocol/bytestream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0e4a570e500b -r 2f3fecd07d6a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Jun 01 15:42:06 2014 +0200 +++ b/src/common/protocol/bytestream.py Sun Jun 01 15:42:28 2014 +0200 @@ -269,7 +269,7 @@ profile = si.getAttr('profile') if profile != nbxmpp.NS_FILE: return - file_props = FilesProp.getFileProp(con.name, iq_obj.getAttr('id')) + file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) if not file_props: return jid = self._ft_get_from(iq_obj)

1 0

gajim: correctly compute hash when doing jingle FT
by Gajim 01 Jun '14

01 Jun '14

changeset e5b0abcf7d50 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e5b0abcf7d50 description: correctly compute hash when doing jingle FT diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 24cfe0ae65b8 -r e5b0abcf7d50 src/gui_interface.py --- a/src/gui_interface.py Sat May 31 11:46:47 2014 +0400 +++ b/src/gui_interface.py Sun Jun 01 15:40:17 2014 +0200 @@ -965,7 +965,7 @@ ft_win.set_status(file_props, 'ok') h = Hashes() try: - file_ = open(file_props.file_name, 'r') + file_ = open(file_props.file_name, 'rb') except: return hash_ = h.calculateHash(file_props.algo, file_)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2014