Commits July 2010

commits@gajim.org

7 participants
83 discussions

gajim: [Jingle] refactor a bit and ignore non-critical errors. F...
by Thibaut Girka 01 Jul '10

01 Jul '10

changeset 4fb081d2345c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4fb081d2345c description: [Jingle] refactor a bit and ignore non-critical errors. Fixes #5794 diffstat: src/common/jingle_session.py | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diffs (69 lines): diff -r 2188b5fc28cf -r 4fb081d2345c src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Jun 30 03:23:18 2010 +0000 +++ b/src/common/jingle_session.py Thu Jul 01 18:30:35 2010 +0200 @@ -318,14 +318,14 @@ def __on_error(self, stanza, jingle, error, action): # FIXME text = error.getTagData('text') - jingle_error = None - xmpp_error = None + error_name = None for child in error.getChildren(): if child.getNamespace() == xmpp.NS_JINGLE_ERRORS: - jingle_error = child.getName() + error_name = child.getName() + break elif child.getNamespace() == xmpp.NS_STANZAS: - xmpp_error = child.getName() - self.__dispatch_error(xmpp_error, jingle_error, text) + error_name = child.getName() + self.__dispatch_error(error_name, text, error.getAttribute('type')) # FIXME: Not sure when we would want to do that... def __on_transport_replace(self, stanza, jingle, error, action): @@ -478,7 +478,7 @@ self.connection.delete_jingle_session(self.sid) reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): - self.__dispatch_error(reason, reason, text) + self.__dispatch_error(reason, text) if text: text = '%s (%s)' % (reason, text) else: @@ -530,14 +530,12 @@ return (contents, contents_rejected, failure_reason) - def __dispatch_error(self, error, jingle_error=None, text=None): - if jingle_error: - error = jingle_error + def __dispatch_error(self, error=None, text=None, type_=None): if text: text = '%s (%s)' % (error, text) - else: - text = error - self.connection.dispatch('JINGLE_ERROR', (self.peerjid, self.sid, text)) + if type_ != 'modify': + self.connection.dispatch('JINGLE_ERROR', + (self.peerjid, self.sid, text or error)) def __reason_from_stanza(self, stanza): # TODO: Move to GUI? @@ -579,7 +577,7 @@ if text: err.setTagData('text', text) self.connection.connection.send(err_stanza) - self.__dispatch_error(error, jingle_error, text) + self.__dispatch_error(jingle_error or error, text, type_) def __append_content(self, jingle, content): """ @@ -630,7 +628,7 @@ # TODO: Move to GUI? reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): - self.__dispatch_error(reason, reason, text) + self.__dispatch_error(reason, text) if text: text = '%s (%s)' % (reason, text) else:

1 0

gajim: parse transport, construct streamhosts
by fantasticsid＠lagaule.org 01 Jul '10

01 Jul '10

changeset 85a5c79d7cf7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=85a5c79d7cf7 description: parse transport, construct streamhosts diffstat: src/common/jingle_ft.py | 14 ++++++++------ src/common/jingle_transport.py | 16 +++++++++++++++- src/common/protocol/bytestream.py | 7 ++++++- 3 files changed, 29 insertions(+), 8 deletions(-) diffs (101 lines): diff -r 3d2d67ef354d -r 85a5c79d7cf7 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 01 13:25:33 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 01 15:48:44 2010 +0800 @@ -98,6 +98,13 @@ self.transport = JingleTransportSocks5() self.transport.set_our_jid(self.session.ourjid) self.transport.set_file_props(self.file_props) + if self.file_props.has_key("streamhosts"): + self.file_props['streamhosts'].extend(self.transport.remote_candidates) + else: + self.file_props['streamhosts'] = self.transport.remote_candidates + for host in self.file_props['streamhosts']: + host['initiator'] = self.session.initiator + host['target'] = self.session.responder log.info("FT request: %s" % file_props) self.session.connection.dispatch('FILE_REQUEST', (jid, file_props)) @@ -106,27 +113,22 @@ def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") - pass + gajim.socks5queue.send_file(self.file_props, self.session.ourjid) def __on_session_terminate(self, stanza, content, error, action): log.info("__on_session_terminate") - pass def __on_transport_accept(self, stanza, content, error, action): log.info("__on_transport_accept") - pass def __on_transport_replace(self, stanza, content, error, action): log.info("__on_transport_replace") - pass def __on_transport_reject(self, stanza, content, error, action): log.info("__on_transport_reject") - pass def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") - pass def _fill_content(self, content): description_node = xmpp.simplexml.Node(tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description') diff -r 3d2d67ef354d -r 85a5c79d7cf7 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Thu Jul 01 13:25:33 2010 +0800 +++ b/src/common/jingle_transport.py Thu Jul 01 15:48:44 2010 +0800 @@ -85,6 +85,7 @@ """ def __init__(self): JingleTransport.__init__(self, TransportType.streaming) + self.remote_candidates = [] def set_file_props(self, file_props): self.file_props = file_props @@ -116,7 +117,20 @@ return transport def parse_transport_stanza(self, transport): - pass + candidates = [] + for candidate in transport.iterTags('candidate'): + cand = { + 'state': 0, + 'target': self.ourjid, + 'host': candidate['host'], + 'port': candidate['port'] + } + candidates.append(cand) + + # we need this when we construct file_props on session-initiation + self.remote_candidates = candidates + return candidates + def _add_local_ips_as_candidates(self): local_ip_cand = [] diff -r 3d2d67ef354d -r 85a5c79d7cf7 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jul 01 13:25:33 2010 +0800 +++ b/src/common/protocol/bytestream.py Thu Jul 01 15:48:44 2010 +0800 @@ -137,12 +137,17 @@ return jid = gajim.get_jid_without_resource(file_props['sender']) resource = gajim.get_resource_from_jid(file_props['sender']) - + sid = file_props['sid'] gajim.socks5queue.add_file_props(session.ourjid, file_props) if not session.accepted: session.approve_session() session.approve_content('file') + + if not gajim.socks5queue.get_file_props(session.ourjid, sid): + gajim.socks5queue.add_file_props(session.ourjid, file_props) + gajim.socks5queue.connect_to_hosts(session.ourjid, sid, + None, None) return iq = xmpp.Iq(to=unicode(file_props['sender']), typ='result')

1 0

gajim: add file_props structure to socks5queue
by fantasticsid＠lagaule.org 01 Jul '10

01 Jul '10

changeset 3d2d67ef354d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3d2d67ef354d description: add file_props structure to socks5queue diffstat: src/common/jingle_ft.py | 2 -- src/common/protocol/bytestream.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r a2d2a17abfd8 -r 3d2d67ef354d src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Jun 19 22:52:17 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 01 13:25:33 2010 +0800 @@ -100,8 +100,6 @@ self.transport.set_file_props(self.file_props) log.info("FT request: %s" % file_props) - #TODO - #add file transfer to queue self.session.connection.dispatch('FILE_REQUEST', (jid, file_props)) diff -r a2d2a17abfd8 -r 3d2d67ef354d src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Jun 19 22:52:17 2010 +0800 +++ b/src/common/protocol/bytestream.py Thu Jul 01 13:25:33 2010 +0800 @@ -138,6 +138,8 @@ jid = gajim.get_jid_without_resource(file_props['sender']) resource = gajim.get_resource_from_jid(file_props['sender']) + gajim.socks5queue.add_file_props(session.ourjid, file_props) + if not session.accepted: session.approve_session() session.approve_content('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 July 2010