Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: revert unwanted change
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 627d4c33003b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=627d4c33003b description: revert unwanted change diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (32 lines): diff -r 70dbe48350ff -r 627d4c33003b src/chat_control.py --- a/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200 @@ -1648,15 +1648,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farstream is + # change tooltip text for audio and video buttons if python-farsight is # not installed - if not gajim.HAVE_FARSTREAM: + if not gajim.HAVE_FARSIGHT: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1704,7 +1704,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSTREAM and self.contact.resource: + gajim.HAVE_FARSIGHT and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else:

1 0

gajim: correctly forward unread printed messages to other resour...
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 70dbe48350ff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70dbe48350ff description: correctly forward unread printed messages to other resources. Fixes #7094 diffstat: src/chat_control.py | 14 +++++++------- src/common/commands.py | 18 +++++++++++------- src/common/events.py | 2 +- src/common/stanza_session.py | 2 +- src/gui_interface.py | 4 ++-- src/roster_window.py | 4 ++-- 6 files changed, 24 insertions(+), 20 deletions(-) diffs (142 lines): diff -r 74adce11c070 -r 70dbe48350ff src/chat_control.py --- a/src/chat_control.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 @@ -980,8 +980,8 @@ show_in_systray = notify.get_show_in_systray(event, self.account, self.contact, type_) - event = gajim.events.create_event(type_, (self, msg_id), - show_in_roster=show_in_roster, + event = gajim.events.create_event(type_, (text, subject, self, + msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster @@ -1648,15 +1648,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1704,7 +1704,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 74adce11c070 -r 70dbe48350ff src/common/commands.py --- a/src/common/commands.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/commands.py Sun Apr 01 19:39:26 2012 +0200 @@ -56,10 +56,10 @@ assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') - cmd = response.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ - 'sessionid': self.sessionid, - 'node': self.commandnode, - 'status': status}) + cmd = response.getTag('command', namespace=xmpp.NS_COMMANDS) + cmd.setAttr('sessionid', self.sessionid) + cmd.setAttr('node', self.commandnode) + cmd.setAttr('status', status) if defaultaction is not None or actions is not None: if defaultaction is not None: assert defaultaction in ('cancel', 'execute', 'prev', 'next', @@ -277,13 +277,17 @@ def execute(self, request): account = self.connection.name # Forward messages - events = gajim.events.get_events(account, types=['chat', 'normal']) + events = gajim.events.get_events(account, types=['chat', 'normal', + 'printed_chat']) j, resource = gajim.get_room_and_nick_from_fjid(self.jid) for jid in events: for event in events[jid]: + ev_typ = event.type_ + if ev_typ == 'printed_chat': + ev_typ = 'chat' self.connection.send_message(j, event.parameters[0], '', - type_=event.type_, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_) + type_=ev_typ, subject=event.parameters[1], + resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') diff -r 74adce11c070 -r 70dbe48350ff src/common/events.py --- a/src/common/events.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/events.py Sun Apr 01 19:39:26 2012 +0200 @@ -45,7 +45,7 @@ where kind in error, incoming file-*: file_props gc_msg: None - printed_chat: control + printed_chat: [message, subject, control, msg_id] printed_*: None messages that are already printed in chat, but not read gc-invitation: [room_jid, reason, password, is_continued] diff -r 74adce11c070 -r 70dbe48350ff src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/stanza_session.py Sun Apr 01 19:39:26 2012 +0200 @@ -99,7 +99,7 @@ for event in gajim.events.get_events(self.conn.name, j, types=types): # the event wasn't in this session if (event.type_ == 'chat' and event.parameters[8] != self) or \ - (event.type_ == 'printed_chat' and event.parameters[0].session != \ + (event.type_ == 'printed_chat' and event.parameters[2].session != \ self): continue diff -r 74adce11c070 -r 70dbe48350ff src/gui_interface.py --- a/src/gui_interface.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/gui_interface.py Sun Apr 01 19:39:26 2012 +0200 @@ -1540,7 +1540,7 @@ return if type_ == 'printed_chat': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'chat': session = event.parameters[8] ctrl = session.control @@ -1578,7 +1578,7 @@ event = gajim.events.get_first_event(account, jid, type_) if type_ == 'printed_pm': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'pm': session = event.parameters[8] diff -r 74adce11c070 -r 70dbe48350ff src/roster_window.py --- a/src/roster_window.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/roster_window.py Sun Apr 01 19:39:26 2012 +0200 @@ -1871,9 +1871,9 @@ for ev in event_list: if ev.type_ != 'printed_chat': continue - if len(ev.parameters) > 1 and ev.parameters[1]: + if len(ev.parameters) > 3 and ev.parameters[3]: # There is a msg_id - msg_ids.append(ev.parameters[1]) + msg_ids.append(ev.parameters[3]) if msg_ids: gajim.logger.set_read_messages(msg_ids)

1 0

gajim: fix getting vcard in rooms where JIDs are public. fixes #...
by Fomin Denis 07 Apr '12

07 Apr '12

changeset 3e5a693616f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e5a693616f1 description: fix getting vcard in rooms where JIDs are public. fixes #7131 diffstat: src/vcard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 5f1b9198345b -r 3e5a693616f1 src/vcard.py --- a/src/vcard.py Sun Mar 25 14:32:30 2012 +0400 +++ b/src/vcard.py Sun Mar 25 16:15:25 2012 +0400 @@ -268,7 +268,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid: + if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: return i = 0 client = '' @@ -299,7 +299,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid: + if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: return i = 0 time_s = ''

1 0

gajim: fix pyopenssl version checking. Fixes #7124
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 74adce11c070 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74adce11c070 description: fix pyopenssl version checking. Fixes #7124 diffstat: src/common/check_X509.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 3e5a693616f1 -r 74adce11c070 src/common/check_X509.py --- a/src/common/check_X509.py Sun Mar 25 16:15:25 2012 +0400 +++ b/src/common/check_X509.py Tue Mar 27 14:57:49 2012 +0200 @@ -5,8 +5,7 @@ import OpenSSL.SSL import OpenSSL.crypto ver = OpenSSL.__version__ - ver_l = [int(i) for i in ver.split('.')] - if ver_l < [0, 12]: + if ver < '0.12': raise ImportError from pyasn1.type import univ, constraint, char, namedtype, tag from pyasn1.codec.der.decoder import decode

1 0

gajim: fix getting vcard in rooms where JIDs are public. fixes #...
by Fomin Denis 07 Apr '12

07 Apr '12

changeset 5f1b9198345b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f1b9198345b description: fix getting vcard in rooms where JIDs are public. fixes #7131 diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f8142335bf82 -r 5f1b9198345b src/vcard.py --- a/src/vcard.py Wed Mar 21 14:29:25 2012 +0400 +++ b/src/vcard.py Sun Mar 25 14:32:30 2012 +0400 @@ -268,7 +268,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return i = 0 client = ''

1 0

gajim: typo in french. Fixes #7128
by Fomin Denis 07 Apr '12

07 Apr '12

changeset f8142335bf82 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f8142335bf82 description: typo in french. Fixes #7128 diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ca9016526a5e -r f8142335bf82 po/fr.po --- a/po/fr.po Mon Mar 19 17:37:05 2012 -0400 +++ b/po/fr.po Wed Mar 21 14:29:25 2012 +0400 @@ -1755,7 +1755,7 @@ #: ../data/gui/preferences_window.ui.h:22 msgid "(example: stunserver.org)" -msgstr "(exemple: stunserver.org)>/i>" +msgstr "(exemple: stunserver.org)" #: ../data/gui/preferences_window.ui.h:23 msgid "Advanced"

1 0

gajim: fix version string
by Fomin Denis 07 Apr '12

07 Apr '12

changeset ad2887b91a07 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad2887b91a07 description: fix version string diffstat: src/common/defs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r e1920c602015 -r ad2887b91a07 src/common/defs.py --- a/src/common/defs.py Thu Mar 29 19:17:52 2012 +0200 +++ b/src/common/defs.py Sun Mar 18 23:53:11 2012 +0400 @@ -32,7 +32,8 @@ try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, stdout=subprocess.PIPE).communicate()[0] - version += '-' + node + if node: + version += '-' + node except Exception: pass

1 0

gajim: re-enable SM when resuming
by Jefry Lagrange 07 Apr '12

07 Apr '12

changeset ca9016526a5e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca9016526a5e description: re-enable SM when resuming diffstat: src/common/xmpp/smacks.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ad2887b91a07 -r ca9016526a5e src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Sun Mar 18 23:53:11 2012 +0400 +++ b/src/common/xmpp/smacks.py Mon Mar 19 17:37:05 2012 -0400 @@ -103,6 +103,7 @@ self.uqueue.pop(0) if stanza.getName() == 'resumed': + self.enabled = True self.resuming = True self.con.set_oldst() if self.uqueue != []:

1 0

gajim: minor fixes
by Jefry Lagrange 07 Apr '12

07 Apr '12

changeset 06bd222f8cc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=06bd222f8cc3 description: minor fixes diffstat: src/common/jingle_ft.py | 24 ++++++++++-------------- src/common/jingle_ftstates.py | 2 +- src/common/xmpp/protocol.py | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diffs (88 lines): diff -r fb50d3e9179e -r 06bd222f8cc3 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Apr 04 21:04:23 2012 -0400 +++ b/src/common/jingle_ft.py Sat Apr 07 00:56:44 2012 -0400 @@ -33,17 +33,16 @@ STATE_NOT_STARTED = 0 STATE_INITIALIZED = 1 -STATE_ACCEPTED = 2 # We send the candidates and we are waiting for a reply -STATE_CAND_SENT = 3 +STATE_CAND_SENT = 2 # We received the candidates and we are waiting to reply -STATE_CAND_RECEIVED = 4 +STATE_CAND_RECEIVED = 3 # We have sent and received the candidates # This also includes any candidate-error received or sent -STATE_CAND_SENT_AND_RECEIVED = 5 -STATE_TRANSPORT_REPLACE = 6 +STATE_CAND_SENT_AND_RECEIVED = 4 +STATE_TRANSPORT_REPLACE = 5 # We are transfering the file -STATE_TRANSFERING = 7 +STATE_TRANSFERING = 6 class JingleFileTransfer(JingleContent): @@ -264,11 +263,9 @@ def __transport_setup(self, stanza=None, content=None, error=None, action=None): # Sets up a few transport specific things for the file transfer - # TODO: Do this inside of a state class - if self.transport.type == TransportType.SOCKS5: - self._listen_host() if self.transport.type == TransportType.IBB: + # No action required, just set the state to transfering self.state = STATE_TRANSFERING @@ -283,15 +280,14 @@ 'sendCand' : True} self.nominated_cand['our-cand'] = streamhost - if self.state == STATE_CAND_RECEIVED: - self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) - else: - self.__state_changed(STATE_CAND_SENT, args) - + self.__sendCand(args) def _on_connect_error(self, sid): log.info('connect error, sid=' + sid) args = {'candError' : True} + self.__sendCand(args) + + def __sendCand(self, args): if self.state == STATE_CAND_RECEIVED: self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) else: diff -r fb50d3e9179e -r 06bd222f8cc3 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Wed Apr 04 21:04:23 2012 -0400 +++ b/src/common/jingle_ftstates.py Sat Apr 07 00:56:44 2012 -0400 @@ -37,12 +37,12 @@ ''' def action(self, args=None): + self.jft._listen_host() if self.jft.weinitiate: # update connection's fileprops self.jft.session.connection.files_props[self.jft.file_props['sid']] = \ self.jft.file_props # Listen on configured port for file transfer - self.jft._listen_host() # TODO: Rename this to listen_host() else: # Add file_props to the queue if not gajim.socks5queue.get_file_props( diff -r fb50d3e9179e -r 06bd222f8cc3 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Wed Apr 04 21:04:23 2012 -0400 +++ b/src/common/xmpp/protocol.py Sat Apr 07 00:56:44 2012 -0400 @@ -90,7 +90,7 @@ NS_JINGLE_RTP = 'urn:xmpp:jingle:apps:rtp:1' # XEP-0167 NS_JINGLE_RTP_AUDIO = 'urn:xmpp:jingle:apps:rtp:audio' # XEP-0167 NS_JINGLE_RTP_VIDEO = 'urn:xmpp:jingle:apps:rtp:video' # XEP-0167 -NS_JINGLE_FILE_TRANSFER ='urn:xmpp:jingle:apps:file-transfer:1' # XEP-0234 +NS_JINGLE_FILE_TRANSFER ='urn:xmpp:jingle:apps:file-transfer:3' # XEP-0234 NS_JINGLE_XTLS='urn:xmpp:jingle:security:xtls:0' # XTLS: EXPERIMENTAL security layer of jingle NS_JINGLE_RAW_UDP = 'urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 NS_JINGLE_ICE_UDP = 'urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176

1 0

gajim: refactoring: implemented state machine pattern
by Jefry Lagrange 05 Apr '12

05 Apr '12

changeset fb50d3e9179e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fb50d3e9179e description: refactoring: implemented state machine pattern diffstat: src/common/jingle_ft.py | 203 +++++++--------------------------- src/common/jingle_ftstates.py | 244 ++++++++++++++++++++++++++++++++++++++++++ src/common/jingle_session.py | 1 - 3 files changed, 288 insertions(+), 160 deletions(-) diffs (truncated from 579 to 300 lines): diff -r c75a03d9cdf9 -r fb50d3e9179e src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Mar 22 00:56:11 2012 -0400 +++ b/src/common/jingle_ft.py Wed Apr 04 21:04:23 2012 -0400 @@ -22,13 +22,13 @@ import gajim import xmpp from jingle_content import contents, JingleContent -from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 -from jingle_transport import JingleTransportIBB, TransportType +from jingle_transport import * from common import helpers from common.socks5 import Socks5ReceiverClient, Socks5SenderClient from common.connection_handlers_events import FileRequestReceivedEvent import threading import logging +from jingle_ftstates import * log = logging.getLogger('gajim.c.jingle_ft') STATE_NOT_STARTED = 0 @@ -68,8 +68,6 @@ self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] - self.state = STATE_NOT_STARTED - self.use_security = use_security self.file_props = file_props @@ -100,8 +98,21 @@ self.session = session self.media = 'file' self.nominated_cand = {} - - + + self.state = STATE_NOT_STARTED + self.states = {STATE_INITIALIZED : StateInitialized(self), + STATE_CAND_SENT : StateCandSent(self), + STATE_CAND_RECEIVED : StateCandReceived(self), + STATE_TRANSFERING : StateTransfering(self), + STATE_TRANSPORT_REPLACE : StateTransportReplace(self), + STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) + } + + def __state_changed(self, nextstate, args=None): + # Executes the next state action and sets the next state + st = self.states[nextstate] + st.action(args) + self.state = nextstate def __on_session_initiate(self, stanza, content, error, action): gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, @@ -148,7 +159,7 @@ response.delChild(response.getQuery()) con.connection.send(response) # We send the file - self.__start_IBB_transfer(con) + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed self.file_props['streamhosts'] = self.transport.remote_candidates @@ -170,12 +181,11 @@ fingerprint = 'client' if self.transport.type == TransportType.SOCKS5: gajim.socks5queue.connect_to_hosts(self.session.connection.name, - self.file_props['sid'], self.send_candidate_used, + self.file_props['sid'], self.on_connect, self._on_connect_error, fingerprint=fingerprint, receiving=False) - elif self.transport.type == TransportType.IBB: - self.state = STATE_TRANSFERING - self.__start_IBB_transfer(self.session.connection) + return + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed def __on_session_terminate(self, stanza, content, error, action): @@ -203,16 +213,16 @@ not self.nominated_cand['peer-cand']: if not self.weinitiate: return - self.session.transport_replace() + self.__state_changed(STATE_TRANSPORT_REPLACE) else: response = stanza.buildReply('result') response.delChild(response.getQuery()) self.session.connection.connection.send(response) - self.start_transfer() + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed else: - self.state = STATE_CAND_RECEIVED - + args = {'candError' : True} + self.__state_changed(STATE_CAND_RECEIVED, args) return if content.getTag('transport').getTag('activated'): @@ -222,73 +232,39 @@ self.session.connection.name, 'client') return - streamhost_cid = content.getTag('transport').getTag('candidate-used').\ - getAttr('cid') - streamhost_used = None - for cand in self.transport.candidates: - if cand['candidate_id'] == streamhost_cid: - streamhost_used = cand - break - if streamhost_used == None: - log.info("unknow streamhost") - return - # We save the candidate nominated by peer - self.nominated_cand['peer-cand'] = streamhost_used + args = {'content' : content, + 'sendCand' : False} if self.state == STATE_CAND_SENT: + self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) response = stanza.buildReply('result') response.delChild(response.getQuery()) self.session.connection.connection.send(response) - self.start_transfer() + self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed else: - self.state = STATE_CAND_RECEIVED + self.__state_changed(STATE_CAND_RECEIVED, args) def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") - if self.weinitiate and self.state == STATE_NOT_STARTED: - self.state = STATE_INITIALIZED - self.session.connection.files_props[self.file_props['sid']] = \ - self.file_props - # Listen on configured port for file transfer - self._listen_host() - - elif not self.weinitiate and self.state == STATE_NOT_STARTED: - # session-accept iq-result - if not self.negotiated: - return - self.state = STATE_ACCEPTED - if not gajim.socks5queue.get_file_props( - self.session.connection.name, self.file_props['sid']): - gajim.socks5queue.add_file_props(self.session.connection.name, - self.file_props) - fingerprint = None - if self.use_security: - fingerprint = 'client' - gajim.socks5queue.connect_to_hosts(self.session.connection.name, - self.file_props['sid'], self.send_candidate_used, - self._on_connect_error, fingerprint=fingerprint) + if self.state == STATE_NOT_STARTED: + self.__state_changed(STATE_INITIALIZED) elif self.state == STATE_CAND_SENT_AND_RECEIVED: if not self.nominated_cand['our-cand'] and \ not self.nominated_cand['peer-cand']: if not self.weinitiate: return - self.session.transport_replace() + self.__state_changed(STATE_TRANSPORT_REPLACE) return # initiate transfer - self.start_transfer() + self.__state_changed(STATE_TRANSFERING) - def __start_IBB_transfer(self, con): - con.files_props[self.file_props['sid']] = self.file_props - fp = open(self.file_props['file-name'], 'r') - con.OpenStream( self.transport.sid, self.session.peerjid, fp, - blocksize=4096) - def __transport_setup(self, stanza=None, content=None, error=None, action=None): # Sets up a few transport specific things for the file transfer + # TODO: Do this inside of a state class if self.transport.type == TransportType.SOCKS5: self._listen_host() @@ -296,48 +272,30 @@ self.state = STATE_TRANSFERING - def send_candidate_used(self, streamhost): + def on_connect(self, streamhost): """ send candidate-used stanza """ log.info('send_candidate_used') if streamhost is None: return + args = {'streamhost' : streamhost, + 'sendCand' : True} self.nominated_cand['our-cand'] = streamhost if self.state == STATE_CAND_RECEIVED: - self.state = STATE_CAND_SENT_AND_RECEIVED + self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) else: - self.state = STATE_CAND_SENT - - content = xmpp.Node('content') - content.setAttr('creator', 'initiator') - content.setAttr('name', self.name) - - transport = xmpp.Node('transport') - transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) - transport.setAttr('sid', self.transport.sid) - - candidateused = xmpp.Node('candidate-used') - candidateused.setAttr('cid', streamhost['cid']) - - transport.addChild(node=candidateused) - content.addChild(node=transport) - - self.session.send_transport_info(content) + self.__state_changed(STATE_CAND_SENT, args) def _on_connect_error(self, sid): - self.nominated_cand['our-cand'] = False - self.send_error_candidate() - + log.info('connect error, sid=' + sid) + args = {'candError' : True} if self.state == STATE_CAND_RECEIVED: - self.state = STATE_CAND_SENT_AND_RECEIVED + self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) else: - self.state = STATE_CAND_SENT - - - log.info('connect error, sid=' + sid) + self.__state_changed(STATE_CAND_SENT, args) def _fill_content(self, content): description_node = xmpp.simplexml.Node( @@ -415,79 +373,6 @@ return self.weinitiate - def start_transfer(self): - - self.state = STATE_TRANSFERING - - # It tells wether we start the transfer as client or server - mode = None - - if self.isOurCandUsed(): - mode = 'client' - streamhost_used = self.nominated_cand['our-cand'] - else: - mode = 'server' - streamhost_used = self.nominated_cand['peer-cand'] - - if streamhost_used['type'] == 'proxy': - self.file_props['is_a_proxy'] = True - if self.weinitiate: - self.file_props['proxy_sender'] = streamhost_used['initiator'] - self.file_props['proxy_receiver'] = streamhost_used['target'] - else: - self.file_props['proxy_sender'] = streamhost_used['target'] - self.file_props['proxy_receiver'] = streamhost_used['initiator'] - - if not self.weinitiate and streamhost_used['type'] == 'proxy': - r = gajim.socks5queue.readers - for reader in r: - if r[reader].host == streamhost_used['host'] and \ - r[reader].connected: - return - - if self.weinitiate and streamhost_used['type'] == 'proxy': - s = gajim.socks5queue.senders - for sender in s: - if s[sender].host == streamhost_used['host'] and \ - s[sender].connected: - return - - if streamhost_used['type'] == 'proxy': - self.file_props['streamhost-used'] = True - streamhost_used['sid'] = self.file_props['sid'] - self.file_props['streamhosts'] = [] - self.file_props['streamhosts'].append(streamhost_used) - self.file_props['proxyhosts'] = [] - self.file_props['proxyhosts'].append(streamhost_used) - - if self.weinitiate: - gajim.socks5queue.idx += 1 - idx = gajim.socks5queue.idx - sockobj = Socks5SenderClient(gajim.idlequeue, idx, - gajim.socks5queue, _sock=None, - host=str(streamhost_used['host']), - port=int(streamhost_used['port']), fingerprint=None, - connected=False, file_props=self.file_props) - else: - sockobj = Socks5ReceiverClient(gajim.idlequeue, streamhost_used, - sid=self.file_props['sid'],

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012