changeset ad00da030d2b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ad00da030d2b description: refactoring
diffstat:
src/common/socks5.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diffs (52 lines):
diff -r 4c7e4328c143 -r ad00da030d2b src/common/socks5.py --- a/src/common/socks5.py Fri Nov 18 15:07:25 2011 -0500 +++ b/src/common/socks5.py Fri Nov 18 18:21:34 2011 -0500 @@ -1088,6 +1088,7 @@
Socks5.__init__(self, idlequeue, host, port, initiator, target, sid)
+ self.type = 'server'
def main(self): """ @@ -1190,6 +1191,8 @@
Socks5.__init__(self, idlequeue, host, port, initiator, target, sid)
+ self.type = 'client' + def main(self, timeout=0): """ Begin negotiation. on success 'address' != 0 @@ -1341,7 +1344,6 @@ Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props)
- self.type = 'client'
@@ -1358,7 +1360,6 @@ host, port, fingerprint , connected, file_props)
- self.type = 'server'
class Socks5ReceiverClient(Socks5Client, Socks5Receiver):
@@ -1371,7 +1372,6 @@ Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint)
- self.type = 'client'
@@ -1387,7 +1387,6 @@ Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint)
- self.type = 'server'
class Socks5Listener(IdleObject):