dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Robey Pointer 2005-06-28 07:23:41 +00:00
parent 727cab9672
commit 6ee7921d06
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paramiko/transport.py
View File

@ -643,11 +643,11 @@ class BaseTransport (threading.Thread):
self._log(DEBUG, 'Sending global request "%s"' % kind) self._log(DEBUG, 'Sending global request "%s"' % kind)
self._send_user_message(m) self._send_user_message(m)
if not wait: if not wait:
return True return None
while True: while True:
self.completion_event.wait(0.1) self.completion_event.wait(0.1)
if not self.active: if not self.active:
return False return None
if self.completion_event.isSet(): if self.completion_event.isSet():
break break
return self.global_response return self.global_response
@ -1224,7 +1224,7 @@ class BaseTransport (threading.Thread):
self._activate_inbound() self._activate_inbound()
# can also free a bunch of stuff here # can also free a bunch of stuff here
self.local_kex_init = self.remote_kex_init = None 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: if not self.initial_kex_done:
# this was the first key exchange # this was the first key exchange
self.initial_kex_done = True self.initial_kex_done = True
@ -1281,8 +1281,8 @@ class BaseTransport (threading.Thread):
if not self.channels.has_key(chanid): if not self.channels.has_key(chanid):
self._log(WARNING, 'Success for unrequested channel! [??]') self._log(WARNING, 'Success for unrequested channel! [??]')
return return
self.lock.acquire()
try: try:
self.lock.acquire()
chan = self.channels[chanid] chan = self.channels[chanid]
chan._set_remote_channel(server_chanid, server_window_size, server_max_packet_size) chan._set_remote_channel(server_chanid, server_window_size, server_max_packet_size)
self._log(INFO, 'Secsh channel %d opened.' % chanid) self._log(INFO, 'Secsh channel %d opened.' % chanid)