diff options
| author | Andreas Schneider <asn@cynapses.org> | 2010-12-08 10:50:08 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cynapses.org> | 2010-12-08 10:52:15 +0100 |
| commit | 038c764055b84430a85ffdb893206dea24dafe28 (patch) | |
| tree | 2d3809a926065a1d3d63ccf35971f8b5ce97926c | |
| parent | 3ea33f9ab68e0a6367a34837fea17e7ea1c04383 (diff) | |
| download | libssh-038c764055b84430a85ffdb893206dea24dafe28.tar.gz libssh-038c764055b84430a85ffdb893206dea24dafe28.tar.xz libssh-038c764055b84430a85ffdb893206dea24dafe28.zip | |
server: Remove channel_write_stderr.
| -rw-r--r-- | include/libssh/libsshpp.hpp | 2 | ||||
| -rw-r--r-- | include/libssh/server.h | 2 | ||||
| -rw-r--r-- | src/server.c | 18 |
3 files changed, 1 insertions, 21 deletions
diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp index b874ae9f..880c4921 100644 --- a/include/libssh/libsshpp.hpp +++ b/include/libssh/libsshpp.hpp @@ -545,7 +545,7 @@ public: int write(const void *data, size_t len, bool is_stderr=false){ int ret; if(is_stderr){ - ret=channel_write_stderr(channel,data,len); + ret=ssh_channel_write_stderr(channel,data,len); } else { ret=ssh_channel_write(channel,data,len); } diff --git a/include/libssh/server.h b/include/libssh/server.h index 6614ada4..cd334c1d 100644 --- a/include/libssh/server.h +++ b/include/libssh/server.h @@ -167,8 +167,6 @@ LIBSSH_API int ssh_handle_key_exchange(ssh_session session); */ LIBSSH_API void ssh_bind_free(ssh_bind ssh_bind_o); -LIBSSH_API int channel_write_stderr(ssh_channel channel, const void *data, uint32_t len); - /* messages.c */ LIBSSH_API int ssh_message_reply_default(ssh_message msg); diff --git a/src/server.c b/src/server.c index 55b677f6..c1d8d692 100644 --- a/src/server.c +++ b/src/server.c @@ -37,7 +37,6 @@ #include "libssh/buffer.h" #include "libssh/packet.h" #include "libssh/socket.h" -#include "libssh/channels.h" #include "libssh/session.h" #include "libssh/misc.h" #include "libssh/keys.h" @@ -478,23 +477,6 @@ int ssh_handle_key_exchange(ssh_session session) { return SSH_OK; } -/** - * @brief Blocking write on channel for stderr. - * - * @param channel The channel to write to. - * - * @param data A pointer to the data to write. - * - * @param len The length of the buffer to write to. - * - * @return The number of bytes written, SSH_ERROR on error. - * - * @see channel_read() - */ -int channel_write_stderr(ssh_channel channel, const void *data, uint32_t len) { - return channel_write_common(channel, data, len, 1); -} - /* messages */ static int ssh_message_auth_reply_default(ssh_message msg,int partial) { |