diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2018-12-10 14:06:55 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-12-10 17:50:19 +0100 |
commit | 917ba07478457793d1239ded124786a9d88e8754 (patch) | |
tree | 8382f6f9ee32627c3a43dfce9bea9264bd99f29d | |
parent | bcdbc11732c495b4b1554d7f537ac992fab21107 (diff) | |
download | libssh-917ba07478457793d1239ded124786a9d88e8754.tar.gz libssh-917ba07478457793d1239ded124786a9d88e8754.tar.xz libssh-917ba07478457793d1239ded124786a9d88e8754.zip |
channels: Reformat ssh_channel_free()
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 1d5b222cc4f1ab03c14932f9e637e957fa8fc21d)
-rw-r--r-- | src/channels.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/channels.c b/src/channels.c index 3147f5ff..4d00378e 100644 --- a/src/channels.c +++ b/src/channels.c @@ -999,28 +999,29 @@ error: * * @warning Any data unread on this channel will be lost. */ -void ssh_channel_free(ssh_channel channel) { - ssh_session session; - - if (channel == NULL) { - return; - } +void ssh_channel_free(ssh_channel channel) +{ + ssh_session session; - session = channel->session; - if (session->alive && channel->state == SSH_CHANNEL_STATE_OPEN) { - ssh_channel_close(channel); - } - channel->flags |= SSH_CHANNEL_FLAG_FREED_LOCAL; + if (channel == NULL) { + return; + } - /* The idea behind the flags is the following : it is well possible - * that a client closes a channel that stills exists on the server side. - * We definitively close the channel when we receive a close message *and* - * the user closed it. - */ - if((channel->flags & SSH_CHANNEL_FLAG_CLOSED_REMOTE) - || (channel->flags & SSH_CHANNEL_FLAG_NOT_BOUND)){ - ssh_channel_do_free(channel); - } + session = channel->session; + if (session->alive && channel->state == SSH_CHANNEL_STATE_OPEN) { + ssh_channel_close(channel); + } + channel->flags |= SSH_CHANNEL_FLAG_FREED_LOCAL; + + /* The idea behind the flags is the following : it is well possible + * that a client closes a channel that stills exists on the server side. + * We definitively close the channel when we receive a close message *and* + * the user closed it. + */ + if ((channel->flags & SSH_CHANNEL_FLAG_CLOSED_REMOTE) || + (channel->flags & SSH_CHANNEL_FLAG_NOT_BOUND)) { + ssh_channel_do_free(channel); + } } /** |