From bb784ec6be1b15c1895d4ec6fb31e35bc29dec81 Mon Sep 17 00:00:00 2001
From: milo <milo@r0ot.me>
Date: Wed, 20 Apr 2011 02:06:43 +0200
Subject: [channels] Added ssh_channel_window_size() and avoided reentrancy in
 channel_write_common() (cherry picked from commit
 7ba09388464f0437da2833b81e268744b20a68fe)

---
 include/libssh/libssh.h |  1 +
 src/channels.c          | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 13efea5a..dfff78cc 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -357,6 +357,7 @@ LIBSSH_API int ssh_channel_select(ssh_channel *readchans, ssh_channel *writechan
         timeval * timeout);
 LIBSSH_API void ssh_channel_set_blocking(ssh_channel channel, int blocking);
 LIBSSH_API int ssh_channel_write(ssh_channel channel, const void *data, uint32_t len);
+LIBSSH_API uint32_t ssh_channel_window_size(ssh_channel channel);
 
 LIBSSH_API int ssh_try_publickey_from_file(ssh_session session, const char *keyfile,
     ssh_string *publickey, int *type);
diff --git a/src/channels.c b/src/channels.c
index cd11ca77..6f39b9c6 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1155,15 +1155,12 @@ int channel_write_common(ssh_channel channel, const void *data,
           "Remote window is %d bytes. going to write %d bytes",
           channel->remote_window,
           len);
-      ssh_log(session, SSH_LOG_PROTOCOL,
-          "Waiting for a growing window message...");
       /* What happens when the channel window is zero? */
-      while(channel->remote_window == 0) {
-        /* parse every incoming packet */
-        if (ssh_handle_packets(session,-1) == SSH_ERROR) {
-          leave_function();
-          return SSH_ERROR;
-        }
+      if(channel->remote_window == 0) {
+          /* nothing can be written */
+          ssh_log(session, SSH_LOG_PROTOCOL,
+                "Wait for a growing window message...");
+          return 0;
       }
       effectivelen = len > channel->remote_window ? channel->remote_window : len;
     } else {
@@ -1212,6 +1209,10 @@ error:
   return SSH_ERROR;
 }
 
+uint32_t ssh_channel_window_size(ssh_channel channel) {
+    return channel->remote_window;
+}
+
 /**
  * @brief Blocking write on a channel.
  *
-- 
cgit