From 470e668ea2377f838987b27d76245703bb8eff30 Mon Sep 17 00:00:00 2001
From: Dimitur Kirov <dkirov@gmail.com>
Date: Fri, 15 Sep 2006 11:57:03 +0000
Subject: [PATCH] This remove unused keyword --line, and those below, will be
ignored--
M socks5.py
M connection_handlers.py
---
src/common/connection_handlers.py | 2 +-
src/common/socks5.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index dc15c9b8e1..8b249fc60d 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -175,7 +175,7 @@ class ConnectionBytestream:
except socket.gaierror:
self.dispatch('ERROR', (_('Wrong host'), _('The host you configured as the ft_override_host_to_send advanced option is not valid, so ignored.')))
ft_override_host_to_send = self.peerhost[0]
- listener = gajim.socks5queue.start_listener(self.peerhost[0], port,
+ listener = gajim.socks5queue.start_listener(port,
sha_str, self._result_socks5_sid, file_props['sid'])
if listener == None:
file_props['error'] = -5
diff --git a/src/common/socks5.py b/src/common/socks5.py
index 6e472e1b81..26d8e56727 100644
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -74,13 +74,13 @@ class SocksQueue:
self.on_success = None
self.on_failure = None
- def start_listener(self, host, port, sha_str, sha_handler, sid):
+ def start_listener(self, port, sha_str, sha_handler, sid):
''' start waiting for incomming connections on (host, port)
and do a socks5 authentication using sid for generated sha
'''
self.sha_handlers[sha_str] = (sha_handler, sid)
if self.listener == None:
- self.listener = Socks5Listener(self.idlequeue, host, port)
+ self.listener = Socks5Listener(self.idlequeue, port)
self.listener.queue = self
self.listener.bind()
if self.listener.started is False:
@@ -790,12 +790,12 @@ class Socks5Sender(Socks5, IdleObject):
self.queue.remove_sender(self.queue_idx, False)
class Socks5Listener(IdleObject):
- def __init__(self, idlequeue, host, port):
- ''' handle all incomming connections on (host, port)
+ def __init__(self, idlequeue, port):
+ ''' handle all incomming connections on (0.0.0.0, port)
This class implements IdleObject, but we will expect
only pollin events though
'''
- self.host, self.port = host, port
+ self.port = port
self.queue_idx = -1
self.idlequeue = idlequeue
self.queue = None
--
GitLab