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

* src/channel.h (channel_table): Added attribute x11_display.

Rev: src/channel.c:1.101
Rev: src/channel.h:1.68
parent 6f45e190
......@@ -270,6 +270,7 @@ make_channel_table(void)
object_queue_init(&table->local_ports);
object_queue_init(&table->remote_ports);
table->x11_display = NULL;
object_queue_init(&table->active_global_requests);
object_queue_init(&table->pending_global_requests);
......@@ -365,7 +366,8 @@ use_channel(struct ssh_connection *connection,
verbose("Taking channel %i in use, (local %i).\n",
channel->channel_number, local_channel_number);
}
/* FIXME: Delete connection argument */
void
register_channel(struct ssh_connection *connection,
UINT32 local_channel_number,
......@@ -685,11 +687,13 @@ DEFINE_PACKET_HANDLER(static, global_failure_handler,
(name channel_request_continuation)
(super command_continuation)
(vars
;; FIXME: Delete connection argument
(connection object ssh_connection)
(channel object ssh_channel)
(active object request_status)))
*/
/* FIXME: Delete connection argument */
static void
send_channel_request_responses(struct ssh_connection *connection,
struct ssh_channel *channel,
......@@ -725,6 +729,7 @@ do_channel_request_response(struct command_continuation *s,
send_channel_request_responses(self->connection, self->channel, q);
}
/* FIXME: Delete connection argument */
static struct command_continuation *
make_channel_request_response(struct ssh_connection *connection,
struct ssh_channel *channel,
......@@ -745,6 +750,7 @@ make_channel_request_response(struct ssh_connection *connection,
(name channel_request_exception_handler)
(super exception_handler)
(vars
;; /* FIXME: Delete connection argument */
(connection object ssh_connection)
(channel object ssh_channel)
(active object request_status)))
......@@ -771,6 +777,7 @@ do_exc_channel_request_handler(struct exception_handler *c,
EXCEPTION_RAISE(c->parent, e);
}
/* FIXME: Delete connection argument */
static struct exception_handler *
make_channel_request_exception_handler(struct ssh_connection *connection,
struct ssh_channel *channel,
......
......@@ -231,6 +231,12 @@ struct channel_request_info
; Forwarded TCP ports
(local_ports struct object_queue)
(remote_ports struct object_queue)
; Used if we're currently forwarding X11
; To support several screens at the same time,
; this should be replaced with a list, analogous to
; the remote_ports list above.
(x11_display object client_x11_display)
; Global requests that we have received, and should reply to
; in the right order
......@@ -302,6 +308,7 @@ make_channel_open_exception(UINT32 error_code, const char *msg);
(vars
(handler method void
"struct ssh_channel *channel"
;; FIXME: Delete connection argument
"struct ssh_connection *connection"
"struct channel_request_info *info"
"struct simple_buffer *args"
......@@ -324,7 +331,8 @@ use_channel(struct ssh_connection *connection,
UINT32 local_channel_number);
void
register_channel(struct ssh_connection *connection,
register_channel(/* FIXME: Delete connection argument */
struct ssh_connection *connection,
UINT32 local_channel_number,
struct ssh_channel *channel,
int take_into_use);
......
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