shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-12 03:00:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

client: Reformat ssh_disconnect()

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
Jakub Jelen
2020-10-02 12:36:16 +02:00
parent 693383d1ef
commit ccb5d6e0ac
1 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/client.c
View File

@@ -689,7 +689,9 @@ int ssh_get_openssh_version(ssh_session session) {
* *
* @param[in] session The SSH session to use. * @param[in] session The SSH session to use.
*/ */
void ssh_disconnect(ssh_session session) { void
ssh_disconnect(ssh_session session)
{
struct ssh_iterator *it; struct ssh_iterator *it;
int rc; int rc;
@@ -704,7 +706,7 @@ void ssh_disconnect(ssh_session session) {
SSH2_DISCONNECT_BY_APPLICATION, SSH2_DISCONNECT_BY_APPLICATION,
"Bye Bye", "Bye Bye",
""); /* language tag */ ""); /* language tag */
if (rc != SSH_OK){ if (rc != SSH_OK) {
ssh_set_error_oom(session); ssh_set_error_oom(session);
goto error; goto error;
} }
@@ -712,6 +714,7 @@ void ssh_disconnect(ssh_session session) {
ssh_packet_send(session); ssh_packet_send(session);
ssh_socket_close(session->socket); ssh_socket_close(session->socket);
} }
error: error:
session->recv_seq = 0; session->recv_seq = 0;
session->send_seq = 0; session->send_seq = 0;
@@ -720,15 +723,15 @@ error:
ssh_socket_reset(session->socket); ssh_socket_reset(session->socket);
} }
session->opts.fd = SSH_INVALID_SOCKET; session->opts.fd = SSH_INVALID_SOCKET;
session->session_state=SSH_SESSION_STATE_DISCONNECTED; session->session_state = SSH_SESSION_STATE_DISCONNECTED;
while ((it=ssh_list_get_iterator(session->channels)) != NULL) { while ((it = ssh_list_get_iterator(session->channels)) != NULL) {
ssh_channel_do_free(ssh_iterator_value(ssh_channel,it)); ssh_channel_do_free(ssh_iterator_value(ssh_channel, it));
ssh_list_remove(session->channels, it); ssh_list_remove(session->channels, it);
} }
if(session->current_crypto){ if (session->current_crypto) {
crypto_free(session->current_crypto); crypto_free(session->current_crypto);
session->current_crypto=NULL; session->current_crypto = NULL;
} }
if (session->next_crypto) { if (session->next_crypto) {
crypto_free(session->next_crypto); crypto_free(session->next_crypto);
@@ -753,19 +756,20 @@ error:
SAFE_FREE(session->serverbanner); SAFE_FREE(session->serverbanner);
SAFE_FREE(session->clientbanner); SAFE_FREE(session->clientbanner);
if(session->ssh_message_list){ if (session->ssh_message_list) {
ssh_message msg; ssh_message msg = NULL;
while((msg=ssh_list_pop_head(ssh_message ,session->ssh_message_list))
!= NULL){ while ((msg = ssh_list_pop_head(ssh_message,
session->ssh_message_list)) != NULL) {
ssh_message_free(msg); ssh_message_free(msg);
} }
ssh_list_free(session->ssh_message_list); ssh_list_free(session->ssh_message_list);
session->ssh_message_list=NULL; session->ssh_message_list = NULL;
} }
if (session->packet_callbacks){ if (session->packet_callbacks) {
ssh_list_free(session->packet_callbacks); ssh_list_free(session->packet_callbacks);
session->packet_callbacks=NULL; session->packet_callbacks = NULL;
} }
} }