Commits

commits@gajim.org

17632 discussions

gajim: correctly compute FT speed and ETA. Fixes #8216
by Gajim 04 Apr '16

04 Apr '16

changeset b61843db50c4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b61843db50c4 description: correctly compute FT speed and ETA. Fixes #8216 diffstat: src/common/socks5.py | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diffs (83 lines): diff -r 8a1a607ca026 -r b61843db50c4 src/common/socks5.py --- a/src/common/socks5.py Sat Apr 02 15:29:26 2016 +0100 +++ b/src/common/socks5.py Mon Apr 04 21:10:57 2016 +0200 @@ -26,6 +26,7 @@ import struct import hashlib import os +import time from errno import EWOULDBLOCK from errno import ENOBUFS from errno import EINTR @@ -292,7 +293,7 @@ sender.file_props.paused = False sender.file_props.stalled = False sender.file_props.elapsed_time = 0 - sender.file_props.last_time = self.idlequeue.current_time() + sender.file_props.last_time = time.time() sender.file_props.received_len = 0 sender.pauses = 0 # start sending file to proxy @@ -606,7 +607,7 @@ fd = open(self.file_props.file_name, opt) self.file_props.fd = fd self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = offset return fd @@ -679,7 +680,7 @@ self.file_props.error = -1 return -1 self.size += lenn - current_time = self.idlequeue.current_time() + current_time = time.time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time self.file_props.last_time = current_time @@ -720,7 +721,7 @@ return 0 fd.write(self.remaining_buff) lenn = len(self.remaining_buff) - current_time = self.idlequeue.current_time() + current_time = time.time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time self.file_props.last_time = current_time @@ -747,7 +748,7 @@ raise e except Exception: buff = b'' - current_time = self.idlequeue.current_time() + current_time = time.time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time self.file_props.last_time = current_time @@ -952,7 +953,7 @@ self.file_props.stalled = False self.file_props.connected = True self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = 0 def start_transfer(self): @@ -1039,7 +1040,7 @@ self.file_props.stalled = False self.file_props.connected = True self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = 0 self.pauses = 0 self.state = 7 @@ -1240,7 +1241,7 @@ self.file_props.paused = False self.file_props.stalled = False self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = 0 self.pauses = 0 # start sending file contents to socket

1 0

gajim: prevent traceback. Fixes #7978
by Gajim 03 Apr '16

03 Apr '16

changeset 7eb2b43c233d 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=7eb2b43c233d description: prevent traceback. Fixes #7978 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 936e4ca17ba5 -r 7eb2b43c233d src/common/connection.py --- a/src/common/connection.py Sun Apr 03 16:42:21 2016 +0200 +++ b/src/common/connection.py Sun Apr 03 21:32:53 2016 +0200 @@ -2735,7 +2735,7 @@ msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', xhtml=obj.xhtml) if obj.label is not None: - msg_iq.addChild(node=label) + msg_iq.addChild(node=obj.label) obj.msg_id = self.connection.send(msg_iq) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None,

1 0

gajim: [ralf] correctly store roster window size in one window m...
by Gajim 03 Apr '16

03 Apr '16

changeset 936e4ca17ba5 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=936e4ca17ba5 description: [ralf] correctly store roster window size in one window mode. Fixes #8314 diffstat: src/roster_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r 718084600324 -r 936e4ca17ba5 src/roster_window.py --- a/src/roster_window.py Sun Apr 03 14:51:06 2016 +0200 +++ b/src/roster_window.py Sun Apr 03 16:42:21 2016 +0200 @@ -2455,9 +2455,6 @@ gajim.config.set('roster_x-position', x) gajim.config.set('roster_y-position', y) width, height = self.window.get_size() - # For the width use the size of the vbox containing the tree and - # status combo, this will cancel out any hpaned width - width = self.xml.get_object('roster_vbox2').allocation.width gajim.config.set('roster_width', width) gajim.config.set('roster_height', height) if not self.xml.get_object('roster_vbox2').get_property('visible'):

1 0

gajim: Fix zeroconf connection and prevent invalid stanzas from ...
by Gajim 03 Apr '16

03 Apr '16

changeset 8a1a607ca026 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8a1a607ca026 description: Fix zeroconf connection and prevent invalid stanzas from being sent. diffstat: src/common/zeroconf/client_zeroconf.py | 7 +++++-- src/common/zeroconf/zeroconf_avahi.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 634cd110eee2 -r 8a1a607ca026 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Apr 03 14:50:47 2016 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Sat Apr 02 15:29:26 2016 +0100 @@ -753,9 +753,12 @@ def send(self, stanza, is_message=False, now=False, on_ok=None, on_not_ok=None): + to = stanza.getTo() + if to is None: + # Can’t send undirected stanza over Zeroconf. + return -1 + to = gajim.get_jid_without_resource(to) stanza.setFrom(self.roster.zeroconf.name) - to = stanza.getTo() - to = gajim.get_jid_without_resource(to) try: item = self.roster[to] diff -r 634cd110eee2 -r 8a1a607ca026 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sun Apr 03 14:50:47 2016 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sat Apr 02 15:29:26 2016 +0100 @@ -144,7 +144,7 @@ val += c if val is None: # missing '=' val = '' - txt_dict[key] = val.decode('utf-8', 'ignore') + txt_dict[key] = val return txt_dict def service_resolved_callback(self, interface, protocol, name, stype, domain,

1 0

gajim: remove debug print
by Gajim 03 Apr '16

03 Apr '16

changeset 718084600324 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=718084600324 description: remove debug print diffstat: src/common/socks5.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r efa00b63103e -r 718084600324 src/common/socks5.py --- a/src/common/socks5.py Sun Apr 03 14:28:08 2016 +0200 +++ b/src/common/socks5.py Sun Apr 03 14:51:06 2016 +0200 @@ -545,7 +545,6 @@ return 1 # we are connected def read_timeout(self): - print('read_timeout') self.idlequeue.remove_timeout(self.fd) if self.state > 5: # no activity for foo seconds

1 0

gajim: remove debug print
by Gajim 03 Apr '16

03 Apr '16

changeset 634cd110eee2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=634cd110eee2 description: remove debug print diffstat: src/common/socks5.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 7e2d67a37a51 -r 634cd110eee2 src/common/socks5.py --- a/src/common/socks5.py Sun Apr 03 14:28:27 2016 +0200 +++ b/src/common/socks5.py Sun Apr 03 14:50:47 2016 +0200 @@ -545,7 +545,6 @@ return 1 # we are connected def read_timeout(self): - print('read_timeout') self.idlequeue.remove_timeout(self.fd) if self.state > 5: # no activity for foo seconds @@ -748,7 +747,6 @@ raise e except Exception: buff = b'' - print('received ' + str(len(buff))) current_time = self.idlequeue.current_time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time

1 0

gajim: better timestamp handling. Fixes #3818
by Gajim 03 Apr '16

03 Apr '16

changeset 48e2fb49ba02 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=48e2fb49ba02 description: better timestamp handling. Fixes #3818 diffstat: src/common/connection_handlers_events.py | 6 +++++- src/common/helpers.py | 27 +++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diffs (60 lines): diff -r 29ffa6a30d77 -r 48e2fb49ba02 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Mar 27 18:09:58 2016 +0200 +++ b/src/common/connection_handlers_events.py Thu Mar 31 22:46:44 2016 +0200 @@ -96,7 +96,11 @@ self.gc_control = minimized.get(self.jid) def _generate_timestamp(self, tag): - tim = helpers.datetime_tuple(tag) + try: + tim = helpers.datetime_tuple(tag) + except Exception: + log.error('wrong timestamp, ignoring it: ' + tag) + tim = localtime() self.timestamp = localtime(timegm(tim)) def get_chatstate(self): diff -r 29ffa6a30d77 -r 48e2fb49ba02 src/common/helpers.py --- a/src/common/helpers.py Sun Mar 27 18:09:58 2016 +0200 +++ b/src/common/helpers.py Thu Mar 31 22:46:44 2016 +0200 @@ -46,6 +46,7 @@ import caps_cache import socket import time +import datetime from encodings.punycode import punycode_encode from string import Template @@ -628,12 +629,26 @@ - XEP-082 datetime strings have all '-' cahrs removed to meet the above format. """ - timestamp = timestamp.split('.')[0] - timestamp = timestamp.replace('-', '') - timestamp = timestamp.replace('z', '') - timestamp = timestamp.replace('Z', '') - from time import strptime - return strptime(timestamp, '%Y%m%dT%H:%M:%S') + date, tim = timestamp.split('T', 1) + date = date.replace('-', '') + tim = tim.replace('z', '') + tim = tim.replace('Z', '') + zone = None + if '+' in tim: + sign = -1 + tim, zone = tim.split('+', 1) + if '-' in tim: + sign = 1 + tim, zone = tim.split('-', 1) + tim = tim.split('.')[0] + tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') + if zone: + tim = datetime.datetime.fromtimestamp(time.mktime(t)) + zone = strptime.time(zone, '%H:%M') + zone = datetime.timedelta(hours=zone.tm_hour, minutes=zone.tm_min) + tim += zone * sign + tim = tim.timetuple() + return tim # import gajim only when needed (after decode_string is defined) see #4764

1 0

gajim: do not warn when tls cert changes for a valid one
by Gajim 03 Apr '16

03 Apr '16

changeset 716b354b7199 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=716b354b7199 description: do not warn when tls cert changes for a valid one diffstat: src/common/connection.py | 15 ++++++++------- src/gui_interface.py | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diffs (42 lines): diff -r 48e2fb49ba02 -r 716b354b7199 src/common/connection.py --- a/src/common/connection.py Thu Mar 31 22:46:44 2016 +0200 +++ b/src/common/connection.py Sat Apr 02 14:06:20 2016 +0200 @@ -1457,13 +1457,14 @@ if saved_fingerprint: # Check sha1 fingerprint if fingerprint != saved_fingerprint: - gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint=fingerprint)) - return True - else: - gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', fingerprint) + if not check_X509.check_certificate(cert, hostname): + gajim.nec.push_incoming_event(FingerprintErrorEvent( + None, conn=self, + certificate=con.Connection.ssl_certificate, + new_fingerprint=fingerprint)) + return True + gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', + fingerprint) if not check_X509.check_certificate(con.Connection.ssl_certificate, hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): diff -r 48e2fb49ba02 -r 716b354b7199 src/gui_interface.py --- a/src/gui_interface.py Thu Mar 31 22:46:44 2016 +0200 +++ b/src/gui_interface.py Sat Apr 02 14:06:20 2016 +0200 @@ -1400,9 +1400,10 @@ pritext = _('SSL certificate error') sectext = _('It seems the SSL certificate of account %(account)s has ' - 'changed or your connection is being hacked.\nOld fingerprint: ' - '%(old)s\nNew fingerprint: %(new)s\n\nDo you still want to connect ' - 'and update the fingerprint of the certificate?') % \ + 'changed and is not valid or your connection is being hacked.\n' + 'Old fingerprint: %(old)s\nNew fingerprint: %(new)s\n\n' + 'Do you still want to connect and update the fingerprint of the ' + 'certificate?') % \ {'account': account, 'old': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha1'), 'new': obj.new_fingerprint} if 'fingerprint_error' in self.instances[account]['online_dialog']:

1 0

gajim: fix sending file over XTLS encrypted socket
by Gajim 03 Apr '16

03 Apr '16

changeset efa00b63103e 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=efa00b63103e description: fix sending file over XTLS encrypted socket diffstat: src/common/jingle_ft.py | 1 + src/common/socks5.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (68 lines): diff -r 716b354b7199 -r efa00b63103e src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Apr 02 14:06:20 2016 +0200 +++ b/src/common/jingle_ft.py Sun Apr 03 14:28:08 2016 +0200 @@ -128,6 +128,7 @@ self.state = nextstate def __on_session_initiate(self, stanza, content, error, action): + log.debug("Jingle FT request received") gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) diff -r 716b354b7199 -r efa00b63103e src/common/socks5.py --- a/src/common/socks5.py Sat Apr 02 14:06:20 2016 +0200 +++ b/src/common/socks5.py Sun Apr 03 14:28:08 2016 +0200 @@ -82,6 +82,7 @@ Start waiting for incomming connections on (host, port) and do a socks5 authentication using sid for generated SHA """ + log.debug('Start listening for socks5 connection') sid = file_props.sid self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None or self.listener.connections == []: @@ -131,11 +132,13 @@ else: fp = fingerprint if receiving: + log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: + log.debug('Trying to connect as sender to cid' + streamhost['cid']) if file_props.sha_str: idx = file_props.sha_str else: @@ -162,6 +165,7 @@ Called when there is a host connected to one of the senders's streamhosts. Stop other attempts for connections """ + log.debug('Connected to cid ' + streamhost['cid']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -223,6 +227,7 @@ """ Called when we loose connection during transfer """ + log.debug('Connection refused to cid ' + streamhost['cid']) if file_props is None: return streamhost['state'] = -1 @@ -540,6 +545,7 @@ return 1 # we are connected def read_timeout(self): + print('read_timeout') self.idlequeue.remove_timeout(self.fd) if self.state > 5: # no activity for foo seconds @@ -649,7 +655,6 @@ def write_next(self): if self.remaining_buff != '': buff = self.remaining_buff - self.remaining_buff = '' else: try: self.open_file_for_reading()

1 0

gajim: fix sending file over XTLS encrypted socket
by Gajim 03 Apr '16

03 Apr '16

changeset ef8964b0afc2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ef8964b0afc2 description: fix sending file over XTLS encrypted socket diffstat: src/common/jingle_ft.py | 1 + src/common/socks5.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diffs (76 lines): diff -r d9e620e58654 -r ef8964b0afc2 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Apr 02 17:10:35 2016 +0200 +++ b/src/common/jingle_ft.py Sun Apr 03 14:28:08 2016 +0200 @@ -128,6 +128,7 @@ self.state = nextstate def __on_session_initiate(self, stanza, content, error, action): + log.debug("Jingle FT request received") gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) diff -r d9e620e58654 -r ef8964b0afc2 src/common/socks5.py --- a/src/common/socks5.py Sat Apr 02 17:10:35 2016 +0200 +++ b/src/common/socks5.py Sun Apr 03 14:28:08 2016 +0200 @@ -82,6 +82,7 @@ Start waiting for incomming connections on (host, port) and do a socks5 authentication using sid for generated SHA """ + log.debug('Start listening for socks5 connection') sid = file_props.sid self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None or self.listener.connections == []: @@ -131,11 +132,13 @@ else: fp = fingerprint if receiving: + log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: + log.debug('Trying to connect as sender to cid' + streamhost['cid']) if file_props.sha_str: idx = file_props.sha_str else: @@ -162,6 +165,7 @@ Called when there is a host connected to one of the senders's streamhosts. Stop other attempts for connections """ + log.debug('Connected to cid ' + streamhost['cid']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -223,6 +227,7 @@ """ Called when we loose connection during transfer """ + log.debug('Connection refused to cid ' + streamhost['cid']) if file_props is None: return streamhost['state'] = -1 @@ -540,6 +545,7 @@ return 1 # we are connected def read_timeout(self): + print('read_timeout') self.idlequeue.remove_timeout(self.fd) if self.state > 5: # no activity for foo seconds @@ -649,7 +655,6 @@ def write_next(self): if self.remaining_buff != b'': buff = self.remaining_buff - self.remaining_buff = b'' else: try: self.open_file_for_reading() @@ -743,6 +748,7 @@ raise e except Exception: buff = b'' + print('received ' + str(len(buff))) current_time = self.idlequeue.current_time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits