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

coding standards

This commit is contained in:
Yann Leboulanger 2012-01-08 20:44:15 +01:00
parent 61a039d894
commit 69544d5f5c
1 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/jingle_ft.py
View File

@ -22,7 +22,8 @@ Handles Jingle File Transfer (XEP 0234)
import gajim
import xmpp
from jingle_content import contents, JingleContent
from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5, JingleTransportIBB, TransportType
from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5
from jingle_transport import JingleTransportIBB, TransportType
from common import helpers
from common.socks5 import Socks5ReceiverClient, Socks5SenderClient
from common.connection_handlers_events import FileRequestReceivedEvent
@ -213,8 +214,6 @@ class JingleFileTransfer(JingleContent):
else:
self.state = STATE_CAND_RECEIVED_PENDING_REPLY
def __on_iq_result(self, stanza, content, error, action):
log.info("__on_iq_result")
@ -259,11 +258,11 @@ class JingleFileTransfer(JingleContent):
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)
con.OpenStream( self.transport.sid, self.session.peerjid, fp,
blocksize=4096)
def __transport_setup(self, stanza=None, content=None, error=None
, action=None):
def __transport_setup(self, stanza=None, content=None, error=None,
action=None):
# Sets up a few transport specific things for the file transfer
if self.transport.type == TransportType.SOCKS5:
self._listen_host()
@ -271,7 +270,6 @@ class JingleFileTransfer(JingleContent):
if self.transport.type == TransportType.IBB:
self.state = STATE_TRANSFERING
def send_candidate_used(self, streamhost):
"""
send candidate-used stanza
@ -302,7 +300,6 @@ class JingleFileTransfer(JingleContent):
self.session.send_transport_info(content)
def _on_connect_error(self, sid):
self.nominated_cand['our-cand'] = False
self.send_error_candidate()
@ -312,7 +309,6 @@ class JingleFileTransfer(JingleContent):
else:
self.state = STATE_CAND_SENT_PENDING_REPLY
log.info('connect error, sid=' + sid)
def _fill_content(self, content):
@ -346,7 +342,6 @@ class JingleFileTransfer(JingleContent):
self.file_props['hash'] = hash_id
def _listen_host(self):
receiver = self.file_props['receiver']
sender = self.file_props['sender']
sha_str = helpers.get_auth_sha(self.file_props['sid'], sender,
@ -371,12 +366,12 @@ class JingleFileTransfer(JingleContent):
if not listener:
# send error message, notify the user
return
def isOurCandUsed(self):
'''
If this method returns true then the candidate we nominated will be
used, if false, the candidate nominated by peer will be used
'''
if self.nominated_cand['peer-cand'] == False:
return True
if self.nominated_cand['our-cand'] == False:
@ -390,9 +385,7 @@ class JingleFileTransfer(JingleContent):
else:
return self.weinitiate
def start_transfer(self):
self.state = STATE_TRANSFERING
# It tells wether we start the transfer as client or server
@ -440,13 +433,10 @@ class JingleFileTransfer(JingleContent):
gajim.socks5queue.idx += 1
idx = gajim.socks5queue.idx
sockobj = Socks5SenderClient(gajim.idlequeue, idx,
gajim.socks5queue,
_sock=None,
gajim.socks5queue, _sock=None,
host=str(streamhost_used['host']),
port=int(streamhost_used['port']),
fingerprint=None,
connected=False,
file_props=self.file_props)
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'],