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

removed prints, reformated code,

Browse source 
decreased write intencity
This commit is contained in:
Dimitur Kirov 2005-08-04 11:16:28 +00:00
parent d5e09e98b5
commit 3ab41b7e87
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/socks5.py
View file

@ -51,10 +51,8 @@ class SocksQueue:
self.listener = Socks5Listener(host, port) self.listener = Socks5Listener(host, port)
self.listener.bind() self.listener.bind()
if self.listener.started is False: if self.listener.started is False:
print 'LISTENER IS NOT STARTED'
return None return None
self.connected += 1 self.connected += 1
print 'LISTENER STARTED'
return self.listener return self.listener
def result_sha(self, sha_str, idx): def result_sha(self, sha_str, idx):
@ -130,7 +128,7 @@ class SocksQueue:
if result == -1: if result == -1:
sender.disconnect() sender.disconnect()
elif sender.state == 7: elif sender.state == 7:
for i in range(10): for i in range(5):
if sender.file_props['paused']: if sender.file_props['paused']:
break break
if not sender.connected: if not sender.connected:
@ -141,6 +139,8 @@ class SocksQueue:
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']:
break
elif sender.state == 8: elif sender.state == 8:
self.remove_sender(idx) self.remove_sender(idx)
else: else:
@ -467,14 +467,11 @@ class Socks5Listener:
self._serv.listen(socket.SOMAXCONN) self._serv.listen(socket.SOMAXCONN)
self._serv.setblocking(False) self._serv.setblocking(False)
except Exception, (errno, errstr): except Exception, (errno, errstr):
print 'EXCEPTION BINDING', (errno, errstr)
return None return None
self.started = True self.started = True
def accept_conn(self): def accept_conn(self):
print 'ACCEPTED CONNECTION',
_sock = self._serv.accept() _sock = self._serv.accept()
print _sock
_sock[0].setblocking(False) _sock[0].setblocking(False)
return _sock return _sock
@ -494,12 +491,12 @@ class Socks5Receiver(Socks5):
self.queue_idx = -1 self.queue_idx = -1
self.queue = None self.queue = None
self.file_props = file_props self.file_props = file_props
self.file_props['started'] = True
self.connected = False self.connected = False
self.pauses = 0 self.pauses = 0
if file_props: if not self.file_props:
file_props['disconnect_cb'] = self.disconnect self.file_props = {}
file_props['error'] = 0 self.file_props['disconnect_cb'] = self.disconnect
self.file_props['error'] = 0
self.file_props['started'] = True self.file_props['started'] = True
self.file_props['completed'] = False self.file_props['completed'] = False
self.file_props['paused'] = False self.file_props['paused'] = False