diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2018-12-10 14:17:32 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-12-10 17:50:14 +0100 |
commit | 79289dc5069b914ad6cf67f7723c2c56707a2029 (patch) | |
tree | 80b1d1435d6c735bc08267b5735d1c8e4e5cb3fd | |
parent | 45172a70fac2f9407ca415733f41f6fc97956998 (diff) | |
download | libssh-79289dc5069b914ad6cf67f7723c2c56707a2029.tar.gz libssh-79289dc5069b914ad6cf67f7723c2c56707a2029.tar.xz libssh-79289dc5069b914ad6cf67f7723c2c56707a2029.zip |
channel: Reformat ssh_channel_close()
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 0ba10870d149ba18c8bb5cf98a776c2c038474bd)
-rw-r--r-- | src/channels.c | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/src/channels.c b/src/channels.c index a0a4c443..65ac28d9 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1128,52 +1128,54 @@ error: * @see ssh_channel_free() * @see ssh_channel_is_eof() */ -int ssh_channel_close(ssh_channel channel){ - ssh_session session; - int rc = 0; +int ssh_channel_close(ssh_channel channel) +{ + ssh_session session; + int rc = 0; - if(channel == NULL) { - return SSH_ERROR; - } + if(channel == NULL) { + return SSH_ERROR; + } - session = channel->session; + session = channel->session; - if (channel->local_eof == 0) { - rc = ssh_channel_send_eof(channel); - } + if (channel->local_eof == 0) { + rc = ssh_channel_send_eof(channel); + } - if (rc != SSH_OK) { - return rc; - } + if (rc != SSH_OK) { + return rc; + } - rc = ssh_buffer_pack(session->out_buffer, - "bd", - SSH2_MSG_CHANNEL_CLOSE, - channel->remote_channel); - if (rc != SSH_OK) { - ssh_set_error_oom(session); - goto error; - } + rc = ssh_buffer_pack(session->out_buffer, + "bd", + SSH2_MSG_CHANNEL_CLOSE, + channel->remote_channel); + if (rc != SSH_OK) { + ssh_set_error_oom(session); + goto error; + } - rc = ssh_packet_send(session); - SSH_LOG(SSH_LOG_PACKET, - "Sent a close on client channel (%d:%d)", - channel->local_channel, - channel->remote_channel); + rc = ssh_packet_send(session); + SSH_LOG(SSH_LOG_PACKET, + "Sent a close on client channel (%d:%d)", + channel->local_channel, + channel->remote_channel); - if(rc == SSH_OK) { - channel->state=SSH_CHANNEL_STATE_CLOSED; - } + if (rc == SSH_OK) { + channel->state = SSH_CHANNEL_STATE_CLOSED; + } - rc = ssh_channel_flush(channel); - if(rc == SSH_ERROR) - goto error; + rc = ssh_channel_flush(channel); + if(rc == SSH_ERROR) { + goto error; + } - return rc; + return rc; error: - ssh_buffer_reinit(session->out_buffer); + ssh_buffer_reinit(session->out_buffer); - return rc; + return rc; } /* this termination function waits for a window growing condition */ |