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

removed useless check. Faster sender speed

This commit is contained in:
Dimitur Kirov 2005-09-09 14:53:19 +00:00
parent 14a49dcf25
commit d9e95eceeb
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/socks5.py
View File

@ -253,6 +253,7 @@ running instance of Gajim. \nFile Transfer will be canceled.\n==================
result = sender.get_file_contents(0) result = sender.get_file_contents(0)
self.process_result(result, sender) self.process_result(result, sender)
elif sender.state == 7: elif sender.state == 7:
while(True):
if sender.file_props['paused']: if sender.file_props['paused']:
break break
if not sender.connected: if not sender.connected:
@ -263,7 +264,7 @@ running instance of Gajim. \nFile Transfer will be canceled.\n==================
break break
result = sender.write_next() result = sender.write_next()
self.process_result(result, sender) self.process_result(result, sender)
if sender.file_props['stalled']: if result <= 0:
break break
elif sender.state == 8: elif sender.state == 8:
self.remove_sender(idx) self.remove_sender(idx)
@ -414,10 +415,7 @@ class Socks5:
self.disconnect() self.disconnect()
return len(raw_data) return len(raw_data)
def write_next(self, initial = False): def write_next(self):
if initial:
self.state = 7
return 1
if self.remaining_buff != '': if self.remaining_buff != '':
buff = self.remaining_buff buff = self.remaining_buff
self.remaining_buff = '' self.remaining_buff = ''
@ -508,7 +506,13 @@ class Socks5:
self.file_props['last-time'] self.file_props['last-time']
self.file_props['last-time'] = current_time self.file_props['last-time'] = current_time
self.file_props['received-len'] += len(buff) self.file_props['received-len'] += len(buff)
try:
fd.write(buff) fd.write(buff)
except IOError, e:
self.rem_fd(fd)
self.disconnect(False)
self.file_props['error'] = -6 # file system error
return 0
if len(buff) == 0 and first_byte is False: if len(buff) == 0 and first_byte is False:
# Transfer stopped somehow: # Transfer stopped somehow:
# reset, paused or network error # reset, paused or network error
@ -669,7 +673,8 @@ class Socks5Sender(Socks5):
self.file_props['last-time'] = time.time() self.file_props['last-time'] = time.time()
self.file_props['received-len'] = 0 self.file_props['received-len'] = 0
self.pauses = 0 self.pauses = 0
return self.write_next(initial = True) # initial for nl byte self.state = 7
return self.write_next() # initial for nl byte
def main(self): def main(self):
''' initial requests for verifying the connection ''' ''' initial requests for verifying the connection '''