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

* src/channel.h (channel_table): Moved information about forwarded

ports here.

* src/channel.c (make_channel_table): Initialize queues for
handling global requests.

Rev: src/channel.c:1.42
Rev: src/channel.h:1.36
parent 48f5a564
......@@ -170,6 +170,9 @@ struct channel_table *make_channel_table(void)
table->pending_close = 0;
object_queue_init(&table->local_ports);
object_queue_init(&table->remote_ports);
object_queue_init(&table->active_global_requests);
object_queue_init(&table->pending_global_requests);
......@@ -458,8 +461,8 @@ static int do_channel_open_response(struct channel_open_callback *c,
return A_WRITE(closure->super.connection->write,
format_open_failure(closure->remote_channel_number,
error, error_msg, ""));
/* The request was invalid */
return LSH_FAIL | LSH_DIE;
/* The request was invalid */
return LSH_FAIL | LSH_DIE;
}
if ( (local_channel_number
......
......@@ -162,6 +162,10 @@
(used_channels simple UINT32)
(max_channels simple UINT32) ; Max number of channels allowed
; Forwarded TCP ports
(local_ports struct object_queue)
(remote_ports struct object_queue)
; Global requests that we have received, and should reply to
; in the right order
(active_global_requests struct object_queue)
......@@ -219,22 +223,6 @@
(connection object ssh_connection)))
*/
/* xxCLASS:
(class
(name channel_open_response)
(vars
(response method int
"struct ssh_channel *channel"
"UINT32 error"
; FIXME: Use an lsh_string for error messages
"char *error_msg"
"struct lsh_string *args")
(connection object ssh_connection)
(remote_channel_number simple UINT32)
(window_size simple UINT32)
(max_packet simple UINT32)))
*/
#define CHANNEL_OPEN_CALLBACK(c, ch, e, m, a) \
(c)->response((c), (ch), (e), (m), (a))
......
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