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

* src/proxy_agentforward.c (do_proxy_open_auth_agent): Updated to

use struct channel_open_info.
* src/proxy_x11forward.c (do_proxy_open_x11): Likewise.
* src/proxy_tcpforward.c (do_proxy_open_direct_tcpip): Likewise.
* src/proxy_session.c (do_proxy_open_session): Likewise.

Rev: src/proxy_agentforward.c:1.3
Rev: src/proxy_session.c:1.7
Rev: src/proxy_tcpforward.c:1.4
Rev: src/proxy_x11forward.c:1.3
parent d55f3380
...@@ -35,14 +35,11 @@ ...@@ -35,14 +35,11 @@
static void static void
do_proxy_open_auth_agent(struct channel_open *s UNUSED, do_proxy_open_auth_agent(struct channel_open *s UNUSED,
struct ssh_connection *connection, struct ssh_connection *connection,
UINT32 type, struct channel_open_info *info,
UINT32 send_window_size,
UINT32 send_max_packet,
struct simple_buffer *args, struct simple_buffer *args,
struct command_continuation *c, struct command_continuation *c,
struct exception_handler *e) struct exception_handler *e)
{ {
if (parse_eod(args)) if (parse_eod(args))
{ {
struct gateway_channel *server struct gateway_channel *server
...@@ -51,8 +48,7 @@ do_proxy_open_auth_agent(struct channel_open *s UNUSED, ...@@ -51,8 +48,7 @@ do_proxy_open_auth_agent(struct channel_open *s UNUSED,
/* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's /* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's
* send_window_size and send_max_packet. */ * send_window_size and send_max_packet. */
struct command *o struct command *o
= make_gateway_channel_open_command(type, = make_gateway_channel_open_command(info,
send_window_size, send_max_packet,
ssh_format(""), ssh_format(""),
NULL); NULL);
......
...@@ -50,9 +50,7 @@ ...@@ -50,9 +50,7 @@
static void static void
do_proxy_open_session(struct channel_open *s, do_proxy_open_session(struct channel_open *s,
struct ssh_connection *connection, struct ssh_connection *connection,
UINT32 type, struct channel_open_info *info,
UINT32 send_window_size,
UINT32 send_max_packet,
struct simple_buffer *args, struct simple_buffer *args,
struct command_continuation *c, struct command_continuation *c,
struct exception_handler *e) struct exception_handler *e)
...@@ -69,8 +67,9 @@ do_proxy_open_session(struct channel_open *s, ...@@ -69,8 +67,9 @@ do_proxy_open_session(struct channel_open *s,
/* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's /* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's
* send_window_size and send_max_packet. */ * send_window_size and send_max_packet. */
struct command *o = struct command *o =
make_gateway_channel_open_command(type, send_window_size, send_max_packet, make_gateway_channel_open_command(info,
ssh_format(""), closure->client_requests); ssh_format(""),
closure->client_requests);
COMMAND_CALL(o, COMMAND_CALL(o,
connection->chain, connection->chain,
......
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
static void static void
do_proxy_open_direct_tcpip(struct channel_open *s UNUSED, do_proxy_open_direct_tcpip(struct channel_open *s UNUSED,
struct ssh_connection *connection, struct ssh_connection *connection,
UINT32 type, struct channel_open_info *info,
UINT32 send_window_size,
UINT32 send_max_packet,
struct simple_buffer *args, struct simple_buffer *args,
struct command_continuation *c, struct command_continuation *c,
struct exception_handler *e) struct exception_handler *e)
...@@ -60,8 +58,7 @@ do_proxy_open_direct_tcpip(struct channel_open *s UNUSED, ...@@ -60,8 +58,7 @@ do_proxy_open_direct_tcpip(struct channel_open *s UNUSED,
* send_window_size and send_max_packet. */ * send_window_size and send_max_packet. */
struct command *o struct command *o
= make_gateway_channel_open_command(type, = make_gateway_channel_open_command(info,
send_window_size, send_max_packet,
ssh_format("%S%i%S%i", ssh_format("%S%i%S%i",
host, port, host, port,
orig_host, orig_port), NULL); orig_host, orig_port), NULL);
...@@ -94,9 +91,7 @@ make_proxy_open_direct_tcpip(void) ...@@ -94,9 +91,7 @@ make_proxy_open_direct_tcpip(void)
static void static void
do_proxy_open_forwarded_tcpip(struct channel_open *s UNUSED, do_proxy_open_forwarded_tcpip(struct channel_open *s UNUSED,
struct ssh_connection *connection, struct ssh_connection *connection,
UINT32 type, struct channel_open_info *info,
UINT32 send_window_size,
UINT32 send_max_packet,
struct simple_buffer *args, struct simple_buffer *args,
struct command_continuation *c, struct command_continuation *c,
struct exception_handler *e) struct exception_handler *e)
...@@ -118,13 +113,13 @@ do_proxy_open_forwarded_tcpip(struct channel_open *s UNUSED, ...@@ -118,13 +113,13 @@ do_proxy_open_forwarded_tcpip(struct channel_open *s UNUSED,
/* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's /* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's
* send_window_size and send_max_packet. */ * send_window_size and send_max_packet. */
struct command *o struct command *o
= make_gateway_channel_open_command(type, = make_gateway_channel_open_command(info,
send_window_size, send_max_packet,
ssh_format("%S%i%S%i", ssh_format("%S%i%S%i",
host, port, host, port,
orig_host, orig_port), NULL); orig_host, orig_port), NULL);
werror("direct-tcpip open request: address where connection was accepted=%S:%i, originator=%S:%i", host, port, orig_host, orig_port); werror("direct-tcpip open request: address where connection was accepted=%S:%i, originator=%S:%i",
host, port, orig_host, orig_port);
COMMAND_CALL(o, COMMAND_CALL(o,
connection->chain, connection->chain,
make_gateway_channel_open_continuation(c, server), make_gateway_channel_open_continuation(c, server),
......
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
static void static void
do_proxy_open_x11(struct channel_open *s UNUSED, do_proxy_open_x11(struct channel_open *s UNUSED,
struct ssh_connection *connection, struct ssh_connection *connection,
UINT32 type, struct channel_open_info *info,
UINT32 send_window_size,
UINT32 send_max_packet,
struct simple_buffer *args, struct simple_buffer *args,
struct command_continuation *c, struct command_continuation *c,
struct exception_handler *e) struct exception_handler *e)
...@@ -62,15 +60,13 @@ do_proxy_open_x11(struct channel_open *s UNUSED, ...@@ -62,15 +60,13 @@ do_proxy_open_x11(struct channel_open *s UNUSED,
/* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's /* NOTE: The origin's rec_window_size and rec_max_packet becomes the target's
* send_window_size and send_max_packet. */ * send_window_size and send_max_packet. */
if (connection->chain->peer_flags & PEER_X11_OPEN_KLUDGE) if (connection->chain->peer_flags & PEER_X11_OPEN_KLUDGE)
o = make_gateway_channel_open_command(type, o = make_gateway_channel_open_command(info,
send_window_size, send_max_packet,
ssh_format("%S", ssh_format("%S",
host), host),
NULL); NULL);
else else
/* FIXME: maybe parse the sent string to get the port value */ /* FIXME: maybe parse the sent string to get the port value */
o = make_gateway_channel_open_command(type, o = make_gateway_channel_open_command(info,
send_window_size, send_max_packet,
ssh_format("%S%i", ssh_format("%S%i",
host, port), host, port),
NULL); NULL);
......
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