Commit d0e05b4d authored by Niels Möller's avatar Niels Möller

*** empty log message ***

Rev: ChangeLog:1.273
Rev: src/client.c:1.102
Rev: src/proxy_agentforward.c:1.4
Rev: src/proxy_session.c:1.8
Rev: src/proxy_tcpforward.c:1.5
Rev: src/proxy_x11forward.c:1.4
Rev: src/server_session.c:1.55
parent fa872487
2000-11-26 Niels Mller <nisse@cuckoo.localdomain>
* src/parse.c (parse_rest, parse_rest_copy): Renamed parse_rest to
parse_rest_copy. New function parse_rest.
* src/gateway_channel.c (do_gateway_channel_request): Use
format_channel_request_i().
(gateway_channel_open_continuation): New attribute fallback.
(do_gateway_channel_open_continuation): Set the target channel's
request_fallback pointer.
(do_channel_open_forward): Set the origin channel's
request_fallback pointer.
* src/channel.h (ssh_channel): Added request_fallback attribute.
(channel_request_info): New struct.
(channel_request): Use a channel_request_info argument.
* src/channel.c (parse_channel_request): New function.
(DEFINE_PACKET_HANDLER): Use parse_channel_request. Invoke request
fallback if appropriate.
(init_channel): Initialize request_fallback = NULL.
(format_channel_open_s): Use a struct lsh_string for the type
argument.
(format_channel_request_i): New function.
* src/spki_commands.c (spki_read_userkeys): Try to decrypt the key.
(make_spki_read_userkeys): New argument tty. If supplied, try to
decrypt password protected keys.
......
......@@ -171,8 +171,7 @@ static void
do_exit_status(struct channel_request *c,
struct ssh_channel *channel,
struct ssh_connection *connection UNUSED,
UINT32 type UNUSED,
int want_reply,
struct channel_request_info *info,
struct simple_buffer *args,
struct command_continuation *s,
struct exception_handler *e)
......@@ -180,7 +179,7 @@ do_exit_status(struct channel_request *c,
CAST(exit_handler, closure, c);
UINT32 status;
if (!want_reply
if (!info->want_reply
&& parse_uint32(args, &status)
&& parse_eod(args))
{
......@@ -205,8 +204,7 @@ static void
do_exit_signal(struct channel_request *c,
struct ssh_channel *channel,
struct ssh_connection *connection UNUSED,
UINT32 type UNUSED,
int want_reply,
struct channel_request_info *info,
struct simple_buffer *args,
struct command_continuation *s,
struct exception_handler *e)
......@@ -222,7 +220,7 @@ do_exit_signal(struct channel_request *c,
const UINT8 *language;
UINT32 language_length;
if (!want_reply
if (!info->want_reply
&& parse_uint32(args, &signal)
&& parse_boolean(args, &core)
&& parse_string(args, &length, &msg)
......
......@@ -55,7 +55,7 @@ do_proxy_open_auth_agent(struct channel_open *s UNUSED,
werror("auth-agent open request\n");
COMMAND_CALL(o,
connection->chain,
make_gateway_channel_open_continuation(c, server),
make_gateway_channel_open_continuation(c, NULL, server),
e);
}
......
......@@ -73,7 +73,7 @@ do_proxy_open_session(struct channel_open *s,
COMMAND_CALL(o,
connection->chain,
make_gateway_channel_open_continuation(c, server),
make_gateway_channel_open_continuation(c, NULL, server),
e);
}
......
......@@ -67,7 +67,7 @@ do_proxy_open_direct_tcpip(struct channel_open *s UNUSED,
host, port, orig_host, orig_port);
COMMAND_CALL(o,
connection->chain,
make_gateway_channel_open_continuation(c, server),
make_gateway_channel_open_continuation(c, NULL, server),
e);
}
......@@ -122,7 +122,7 @@ do_proxy_open_forwarded_tcpip(struct channel_open *s UNUSED,
host, port, orig_host, orig_port);
COMMAND_CALL(o,
connection->chain,
make_gateway_channel_open_continuation(c, server),
make_gateway_channel_open_continuation(c, NULL, server),
e);
}
......
......@@ -76,7 +76,7 @@ do_proxy_open_x11(struct channel_open *s UNUSED,
werror("datafellows compatible x11 open request: %S\n", host);
COMMAND_CALL(o,
connection->chain,
make_gateway_channel_open_continuation(c, server),
make_gateway_channel_open_continuation(c, NULL, server),
e);
}
......
......@@ -602,8 +602,7 @@ static void
do_spawn_shell(struct channel_request *c,
struct ssh_channel *channel,
struct ssh_connection *connection,
UINT32 type UNUSED,
int want_reply UNUSED,
struct channel_request_info *info UNUSED,
struct simple_buffer *args,
struct command_continuation *s,
struct exception_handler *e)
......@@ -699,8 +698,7 @@ static void
do_spawn_exec(struct channel_request *c,
struct ssh_channel *channel,
struct ssh_connection *connection,
UINT32 type UNUSED,
int want_reply UNUSED,
struct channel_request_info *info UNUSED,
struct simple_buffer *args,
struct command_continuation *s,
struct exception_handler *e)
......@@ -810,8 +808,7 @@ static void
do_alloc_pty(struct channel_request *c UNUSED,
struct ssh_channel *channel,
struct ssh_connection *connection,
UINT32 type UNUSED,
int want_reply UNUSED,
struct channel_request_info *info UNUSED,
struct simple_buffer *args,
struct command_continuation *s,
struct exception_handler *e)
......
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