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

refactoring

This commit is contained in:
Jefry Lagrange 2011-11-18 15:07:25 -05:00
parent bc78e35d55
commit 543e0265de
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/socks5.py
View File

@ -311,13 +311,8 @@ class SocksQueue:
def send_file(self, file_props, account, type): def send_file(self, file_props, account, type):
for key in self.senders.keys(): for key in self.senders.keys():
if isinstance(self.senders[key], Socks5SenderClient): if file_props['name'] in key and file_props['sid'] in key \
objtype = 'client' and self.senders[key].type == type:
else:
objtype = 'server'
if file_props['name'] in key and file_props['sid'] in key \
and objtype == type:
log.info("socks5: sending file") log.info("socks5: sending file")
sender = self.senders[key] sender = self.senders[key]
@ -575,8 +570,7 @@ class Socks5:
self.pollend() self.pollend()
else: else:
if isinstance(self, Socks5SenderClient) or isinstance(self, if self.type == 'client':
Socks5ReceiverClient):
self.queue.reconnect_client(self, self.streamhost) self.queue.reconnect_client(self, self.streamhost)
def open_file_for_reading(self): def open_file_for_reading(self):
@ -1347,6 +1341,8 @@ class Socks5SenderClient(Socks5Client, Socks5Sender):
Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock,
host, port, fingerprint , connected, file_props) host, port, fingerprint , connected, file_props)
self.type = 'client'
@ -1362,6 +1358,8 @@ class Socks5SenderServer(Socks5Server, Socks5Sender):
host, port, fingerprint , connected, file_props) host, port, fingerprint , connected, file_props)
self.type = 'server'
class Socks5ReceiverClient(Socks5Client, Socks5Receiver): class Socks5ReceiverClient(Socks5Client, Socks5Receiver):
def __init__(self, idlequeue, streamhost, sid, file_props = None, def __init__(self, idlequeue, streamhost, sid, file_props = None,
@ -1373,6 +1371,8 @@ class Socks5ReceiverClient(Socks5Client, Socks5Receiver):
Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props,
fingerprint) fingerprint)
self.type = 'client'
class Socks5ReceiverServer(Socks5Server, Socks5Receiver): class Socks5ReceiverServer(Socks5Server, Socks5Receiver):
@ -1387,6 +1387,7 @@ class Socks5ReceiverServer(Socks5Server, Socks5Receiver):
Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props,
fingerprint) fingerprint)
self.type = 'server'
class Socks5Listener(IdleObject): class Socks5Listener(IdleObject):