Commit aea7bf3d authored by Niels Möller's avatar Niels Möller
Browse files

* src/channel.c (do_channel_open_failure): Improved exception

message.
(make_channel_read_data, make_channel_read_stderr): Changed return
type to io_callback.

Rev: src/channel.c:1.70
Rev: src/channel.h:1.50
parent b871ce66
......@@ -1240,7 +1240,7 @@ do_channel_open_failure(struct packet_handler *closure UNUSED,
/* FIXME: It would be nice to pass the message on. */
EXCEPTION_RAISE(channel->e,
make_channel_open_exception(reason, "Refused by server"));
make_channel_open_exception(reason, "Refused by peer"));
EXCEPTION_RAISE(channel->e, &finish_exception);
}
else
......@@ -1610,13 +1610,13 @@ make_channel_write_extended(struct ssh_channel *channel,
return &closure->super.super;
}
struct io_read_callback *
struct io_callback *
make_channel_read_data(struct ssh_channel *channel)
{
return make_read_data(channel, make_channel_write(channel));
}
struct io_read_callback *
struct io_callback *
make_channel_read_stderr(struct ssh_channel *channel)
{
return make_read_data(channel,
......
......@@ -32,6 +32,7 @@
#include "connection.h"
#include "parse.h"
#include "server_pty.h"
#include "write_buffer.h"
#define GABA_DECLARE
#include "channel.h.x"
......@@ -298,8 +299,8 @@ struct abstract_write *make_channel_write(struct ssh_channel *channel);
struct abstract_write *make_channel_write_extended(struct ssh_channel *channel,
UINT32 type);
struct io_read_callback *make_channel_read_data(struct ssh_channel *channel);
struct io_read_callback *make_channel_read_stderr(struct ssh_channel *channel);
struct io_callback *make_channel_read_data(struct ssh_channel *channel);
struct io_callback *make_channel_read_stderr(struct ssh_channel *channel);
struct lsh_string *format_global_failure(void);
struct lsh_string *format_global_success(void);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment