summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobey Pointer <robey@lag.net>2004-11-26 22:07:31 +0000
committerRobey Pointer <robey@lag.net>2004-11-26 22:07:31 +0000
commited8b3762057cd206ef0262920991ba87ec193184 (patch)
tree5d854fbdc5d5d2c65faa3a920ebf450b2841ef99
parentdf63dc41549fa0e997049cb79d82e3f9d66edfe1 (diff)
[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-116]
doc fixups explain "recv_ready" better, and add debug descriptions for the kex codes.
-rw-r--r--README1
-rw-r--r--paramiko/channel.py4
-rw-r--r--paramiko/common.py5
3 files changed, 9 insertions, 1 deletions
diff --git a/README b/README
index 32184944..fdb21cf4 100644
--- a/README
+++ b/README
@@ -205,3 +205,4 @@ v0.9 FEAROW
* server mode needs better documentation
* sftp server mode
* figure out if there's a way to put stdout/stderr on different channels?
+* add method to block until a channel's "exit-status" is set
diff --git a/paramiko/channel.py b/paramiko/channel.py
index 833ae62b..202f89a3 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -379,7 +379,9 @@ class Channel (object):
def recv_ready(self):
"""
- Returns true if data is ready to be read from this channel.
+ Returns true if data is buffered and ready to be read from this
+ channel. A C{False} result does not mean that the channel has closed;
+ it means you may need to wait before more data arrives.
@return: C{True} if a L{recv} call on this channel would immediately
return at least one byte; C{False} otherwise.
diff --git a/paramiko/common.py b/paramiko/common.py
index 41972abf..d7414d16 100644
--- a/paramiko/common.py
+++ b/paramiko/common.py
@@ -44,6 +44,11 @@ MSG_NAMES = {
MSG_SERVICE_ACCEPT: 'service-accept',
MSG_KEXINIT: 'kexinit',
MSG_NEWKEYS: 'newkeys',
+ 30: 'kex30',
+ 31: 'kex31',
+ 32: 'kex32',
+ 33: 'kex33',
+ 34: 'kex34',
MSG_USERAUTH_REQUEST: 'userauth-request',
MSG_USERAUTH_FAILURE: 'userauth-failure',
MSG_USERAUTH_SUCCESS: 'userauth-success',