copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TB on connection timeout

This commit is contained in:
Dimitur Kirov 2005-08-14 22:29:16 +00:00
parent d286a5b187
commit 5f0b36004d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/connection.py
View File

@ -472,7 +472,7 @@ class Connection:
stream_tag.setAttr('jid', streamhost['jid']) stream_tag.setAttr('jid', streamhost['jid'])
self.to_be_sent.append(iq) self.to_be_sent.append(iq)
def _connect_error(self, to, _id, code = 404): def _connect_error(self, to, _id, sid, code = 404):
msg_dict = { msg_dict = {
404: 'Could not connect to given hosts', 404: 'Could not connect to given hosts',
405: 'Cancel', 405: 'Cancel',
@ -488,11 +488,11 @@ class Connection:
err.setData(msg) err.setData(msg)
self.to_be_sent.append(iq) self.to_be_sent.append(iq)
if code == 404: if code == 404:
sid = _id[3:]
file_props = gajim.socks5queue.get_file_props(self.name, sid) file_props = gajim.socks5queue.get_file_props(self.name, sid)
self.disconnect_transfer(file_props) if file_props is not None:
file_props['error'] = -3 self.disconnect_transfer(file_props)
self.dispatch('FILE_REQUEST_ERROR', (to, file_props)) file_props['error'] = -3
self.dispatch('FILE_REQUEST_ERROR', (to, file_props))
def _bytestreamResultCB(self, con, iq_obj): def _bytestreamResultCB(self, con, iq_obj):
gajim.log.debug('_bytestreamResultCB') gajim.log.debug('_bytestreamResultCB')
@ -579,7 +579,7 @@ class Connection:
fasts = file_props['fast'] fasts = file_props['fast']
if len(fasts) > 0: if len(fasts) > 0:
self._connect_error(str(iq_obj.getFrom()), fasts[0]['id'], self._connect_error(str(iq_obj.getFrom()), fasts[0]['id'],
code = 406) file_props['sid'], code = 406)
raise common.xmpp.NodeProcessed raise common.xmpp.NodeProcessed
@ -598,7 +598,7 @@ class Connection:
if file_props.has_key('streamhosts'): if file_props.has_key('streamhosts'):
for host in file_props['streamhosts']: for host in file_props['streamhosts']:
if host['idx'] > 0: if host.has_key('idx') and host['idx'] > 0:
gajim.socks5queue.remove_receiver(host['idx']) gajim.socks5queue.remove_receiver(host['idx'])
gajim.socks5queue.remove_sender(host['idx']) gajim.socks5queue.remove_sender(host['idx'])
sid = file_props['sid'] sid = file_props['sid']
@ -616,7 +616,7 @@ class Connection:
if file_props.has_key('streamhosts'): if file_props.has_key('streamhosts'):
for host in file_props['streamhosts']: for host in file_props['streamhosts']:
if host['idx'] > 0: if host.has_key('idx') and host['idx'] > 0:
gajim.socks5queue.remove_receiver(host['idx']) gajim.socks5queue.remove_receiver(host['idx'])
gajim.socks5queue.remove_sender(host['idx']) gajim.socks5queue.remove_sender(host['idx'])
@ -756,7 +756,7 @@ class Connection:
file_props['error'] = -5 file_props['error'] = -5
self.dispatch('FILE_REQUEST_ERROR', (str(receiver), file_props)) self.dispatch('FILE_REQUEST_ERROR', (str(receiver), file_props))
self._connect_error(str(receiver), file_props['sid'], self._connect_error(str(receiver), file_props['sid'],
code = 406) file_props['sid'], code = 406)
return return
iq = common.xmpp.Protocol(name = 'iq', to = str(receiver), iq = common.xmpp.Protocol(name = 'iq', to = str(receiver),

2
src/common/socks5.py
View File

@ -118,7 +118,7 @@ running instance of Gajim. \nFile Transfer will be canceled.\n==================
return return
if file_props['failure_cb']: if file_props['failure_cb']:
file_props['failure_cb'](streamhost['initiator'], streamhost['id'], file_props['failure_cb'](streamhost['initiator'], streamhost['id'],
code = 404) file_props['sid'], code = 404)
def add_receiver(self, account, sock5_receiver): def add_receiver(self, account, sock5_receiver):
''' add new file request ''' ''' add new file request '''