diff options
| author | Robey Pointer <robey@lag.net> | 2005-06-28 07:23:41 +0000 |
|---|---|---|
| committer | Robey Pointer <robey@lag.net> | 2005-06-28 07:23:41 +0000 |
| commit | 6ee7921d066396da13da7744fc0e0591a516453f (patch) | |
| tree | 59845387b59955b9cb0c7db6a0cd427eb09ddc92 | |
| parent | 727cab9672d5951ee8d11667ba760b29b58b7527 (diff) | |
[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-18]
tweak random stuff in transport that i forgot what it does
| -rw-r--r-- | paramiko/transport.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index dc0632ac..21bc7ed6 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -643,11 +643,11 @@ class BaseTransport (threading.Thread): self._log(DEBUG, 'Sending global request "%s"' % kind) self._send_user_message(m) if not wait: - return True + return None while True: self.completion_event.wait(0.1) if not self.active: - return False + return None if self.completion_event.isSet(): break return self.global_response @@ -1224,7 +1224,7 @@ class BaseTransport (threading.Thread): self._activate_inbound() # can also free a bunch of stuff here self.local_kex_init = self.remote_kex_init = None - self.e = self.f = self.K = self.x = None + self.K = None if not self.initial_kex_done: # this was the first key exchange self.initial_kex_done = True @@ -1281,8 +1281,8 @@ class BaseTransport (threading.Thread): if not self.channels.has_key(chanid): self._log(WARNING, 'Success for unrequested channel! [??]') return + self.lock.acquire() try: - self.lock.acquire() chan = self.channels[chanid] chan._set_remote_channel(server_chanid, server_window_size, server_max_packet_size) self._log(INFO, 'Secsh channel %d opened.' % chanid) |