From ef5701a5357e3f5b71aa5c387e4f976fe5df0ab7 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Sun, 28 Aug 2011 14:27:24 +0300 Subject: Channels: fix the "server specified invalid channel" bug Resolved by introducing a flag entry in channel structure. --- include/libssh/channels.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/libssh/channels.h b/include/libssh/channels.h index 624a3adf..87415e5f 100644 --- a/include/libssh/channels.h +++ b/include/libssh/channels.h @@ -48,6 +48,13 @@ enum ssh_channel_state_e { SSH_CHANNEL_STATE_CLOSED }; +/* The channel has been closed by the remote side */ +#define SSH_CHANNEL_FLAG_CLOSED_REMOTE 0x1 +/* The channel has been freed by the calling program */ +#define SSH_CHANNEL_FLAG_FREED_LOCAL 0x2 +/* the channel has not yet been bound to a remote one */ +#define SSH_CHANNEL_FLAG_NOT_BOUND 0x4 + struct ssh_channel_struct { ssh_session session; /* SSH_SESSION pointer */ uint32_t local_channel; @@ -61,6 +68,7 @@ struct ssh_channel_struct { uint32_t remote_maxpacket; enum ssh_channel_state_e state; int delayed_close; + int flags; ssh_buffer stdout_buffer; ssh_buffer stderr_buffer; void *userarg; @@ -90,6 +98,7 @@ uint32_t ssh_channel_new_id(ssh_session session); ssh_channel ssh_channel_from_local(ssh_session session, uint32_t id); int channel_write_common(ssh_channel channel, const void *data, uint32_t len, int is_stderr); +void ssh_channel_do_free(ssh_channel channel); #ifdef WITH_SSH1 SSH_PACKET_CALLBACK(ssh_packet_data1); SSH_PACKET_CALLBACK(ssh_packet_close1); -- cgit