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

refactoring

Browse source
This commit is contained in:
Jefry Lagrange 2012-02-12 19:36:20 -05:00
parent b2897e36bb
commit ca1eadaa2d
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/common/jingle_ft.py
View file

@ -34,18 +34,16 @@ log = logging.getLogger('gajim.c.jingle_ft')
STATE_NOT_STARTED = 0 STATE_NOT_STARTED = 0
STATE_INITIALIZED = 1 STATE_INITIALIZED = 1
STATE_ACCEPTED = 2 STATE_ACCEPTED = 2
STATE_TRANSPORT_INFO = 3
STATE_PROXY_ACTIVATED = 4
# We send the candidates and we are waiting for a reply # We send the candidates and we are waiting for a reply
STATE_CAND_SENT_PENDING_REPLY = 5 STATE_CAND_SENT = 3
# We received the candidates and we are waiting to reply # We received the candidates and we are waiting to reply
STATE_CAND_RECEIVED_PENDING_REPLY = 6 STATE_CAND_RECEIVED = 4
# We have sent and received the candidates # We have sent and received the candidates
# This also includes any candidate-error received or sent # This also includes any candidate-error received or sent
STATE_CAND_SENT_AND_RECEIVED = 7 STATE_CAND_SENT_AND_RECEIVED = 5
STATE_TRANSPORT_REPLACE = 6
# We are transfering the file # We are transfering the file
STATE_TRANSFERING = 8 STATE_TRANSFERING = 7
STATE_TRANSPORT_REPLACE = 9
class JingleFileTransfer(JingleContent): class JingleFileTransfer(JingleContent):
@ -200,7 +198,7 @@ class JingleFileTransfer(JingleContent):
if content.getTag('transport').getTag('candidate-error'): if content.getTag('transport').getTag('candidate-error'):
self.nominated_cand['peer-cand'] = False self.nominated_cand['peer-cand'] = False
if self.state == STATE_CAND_SENT_PENDING_REPLY: if self.state == STATE_CAND_SENT:
if not self.nominated_cand['our-cand'] and \ if not self.nominated_cand['our-cand'] and \
not self.nominated_cand['peer-cand']: not self.nominated_cand['peer-cand']:
if not self.weinitiate: if not self.weinitiate:
@ -213,7 +211,7 @@ class JingleFileTransfer(JingleContent):
self.start_transfer() self.start_transfer()
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
else: else:
self.state = STATE_CAND_RECEIVED_PENDING_REPLY self.state = STATE_CAND_RECEIVED
return return
@ -236,14 +234,14 @@ class JingleFileTransfer(JingleContent):
return return
# We save the candidate nominated by peer # We save the candidate nominated by peer
self.nominated_cand['peer-cand'] = streamhost_used self.nominated_cand['peer-cand'] = streamhost_used
if self.state == STATE_CAND_SENT_PENDING_REPLY: if self.state == STATE_CAND_SENT:
response = stanza.buildReply('result') response = stanza.buildReply('result')
response.delChild(response.getQuery()) response.delChild(response.getQuery())
self.session.connection.connection.send(response) self.session.connection.connection.send(response)
self.start_transfer() self.start_transfer()
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
else: else:
self.state = STATE_CAND_RECEIVED_PENDING_REPLY self.state = STATE_CAND_RECEIVED
@ -272,12 +270,6 @@ class JingleFileTransfer(JingleContent):
gajim.socks5queue.connect_to_hosts(self.session.connection.name, gajim.socks5queue.connect_to_hosts(self.session.connection.name,
self.file_props['sid'], self.send_candidate_used, self.file_props['sid'], self.send_candidate_used,
self._on_connect_error, fingerprint=fingerprint) self._on_connect_error, fingerprint=fingerprint)
elif not self.weinitiate and self.state == STATE_ACCEPTED:
# transport-info iq-result
self.state = STATE_TRANSPORT_INFO
elif self.weinitiate and self.state == STATE_INITIALIZED:
# proxy activated
self.state = STATE_PROXY_ACTIVATED
elif self.state == STATE_CAND_SENT_AND_RECEIVED: elif self.state == STATE_CAND_SENT_AND_RECEIVED:
if not self.nominated_cand['our-cand'] and \ if not self.nominated_cand['our-cand'] and \
not self.nominated_cand['peer-cand']: not self.nominated_cand['peer-cand']:
@ -313,10 +305,10 @@ class JingleFileTransfer(JingleContent):
return return
self.nominated_cand['our-cand'] = streamhost self.nominated_cand['our-cand'] = streamhost
if self.state == STATE_CAND_RECEIVED_PENDING_REPLY: if self.state == STATE_CAND_RECEIVED:
self.state = STATE_CAND_SENT_AND_RECEIVED self.state = STATE_CAND_SENT_AND_RECEIVED
else: else:
self.state = STATE_CAND_SENT_PENDING_REPLY self.state = STATE_CAND_SENT
content = xmpp.Node('content') content = xmpp.Node('content')
content.setAttr('creator', 'initiator') content.setAttr('creator', 'initiator')
@ -339,10 +331,10 @@ class JingleFileTransfer(JingleContent):
self.nominated_cand['our-cand'] = False self.nominated_cand['our-cand'] = False
self.send_error_candidate() self.send_error_candidate()
if self.state == STATE_CAND_RECEIVED_PENDING_REPLY: if self.state == STATE_CAND_RECEIVED:
self.state = STATE_CAND_SENT_AND_RECEIVED self.state = STATE_CAND_SENT_AND_RECEIVED
else: else:
self.state = STATE_CAND_SENT_PENDING_REPLY self.state = STATE_CAND_SENT
log.info('connect error, sid=' + sid) log.info('connect error, sid=' + sid)