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

session: Reformat ssh_new()

Browse Source 
Fixes T194

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2019-11-05 10:26:15 +01:00
committed by Andreas Schneider
parent c54fd03e50
commit 3f64fb3b3b
1 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/session.c
View File

@@ -56,50 +56,51 @@
* *
* @returns A new ssh_session pointer, NULL on error. * @returns A new ssh_session pointer, NULL on error.
*/ */
ssh_session ssh_new(void) { ssh_session ssh_new(void)
ssh_session session; {
char *id = NULL; ssh_session session;
int rc; char *id = NULL;
int rc;
session = calloc(1, sizeof (struct ssh_session_struct)); session = calloc(1, sizeof (struct ssh_session_struct));
if (session == NULL) { if (session == NULL) {
return NULL; return NULL;
} }
session->next_crypto = crypto_new(); session->next_crypto = crypto_new();
if (session->next_crypto == NULL) { if (session->next_crypto == NULL) {
goto err; goto err;
} }
session->socket = ssh_socket_new(session); session->socket = ssh_socket_new(session);
if (session->socket == NULL) { if (session->socket == NULL) {
goto err; goto err;
} }
session->out_buffer = ssh_buffer_new(); session->out_buffer = ssh_buffer_new();
if (session->out_buffer == NULL) { if (session->out_buffer == NULL) {
goto err; goto err;
} }
session->in_buffer=ssh_buffer_new(); session->in_buffer = ssh_buffer_new();
if (session->in_buffer == NULL) { if (session->in_buffer == NULL) {
goto err; goto err;
} }
session->out_queue = ssh_list_new(); session->out_queue = ssh_list_new();
if (session->out_queue == NULL) { if (session->out_queue == NULL) {
goto err; goto err;
} }
session->alive = 0; session->alive = 0;
session->auth.supported_methods = 0; session->auth.supported_methods = 0;
ssh_set_blocking(session, 1); ssh_set_blocking(session, 1);
session->maxchannel = FIRST_CHANNEL; session->maxchannel = FIRST_CHANNEL;
#ifndef _WIN32 #ifndef _WIN32
session->agent = ssh_agent_new(session); session->agent = ssh_agent_new(session);
if (session->agent == NULL) { if (session->agent == NULL) {
goto err; goto err;
} }
#endif /* _WIN32 */ #endif /* _WIN32 */
@@ -107,52 +108,57 @@ ssh_session ssh_new(void) {
session->opts.StrictHostKeyChecking = 1; session->opts.StrictHostKeyChecking = 1;
session->opts.port = 0; session->opts.port = 0;
session->opts.fd = -1; session->opts.fd = -1;
session->opts.compressionlevel=7; session->opts.compressionlevel = 7;
session->opts.nodelay = 0; session->opts.nodelay = 0;
session->opts.flags = SSH_OPT_FLAG_PASSWORD_AUTH | SSH_OPT_FLAG_PUBKEY_AUTH |
SSH_OPT_FLAG_KBDINT_AUTH | SSH_OPT_FLAG_GSSAPI_AUTH; session->opts.flags = SSH_OPT_FLAG_PASSWORD_AUTH |
SSH_OPT_FLAG_PUBKEY_AUTH |
SSH_OPT_FLAG_KBDINT_AUTH |
SSH_OPT_FLAG_GSSAPI_AUTH;
session->opts.identity = ssh_list_new(); session->opts.identity = ssh_list_new();
if (session->opts.identity == NULL) { if (session->opts.identity == NULL) {
goto err; goto err;
} }
id = strdup("%d/id_ed25519"); id = strdup("%d/id_ed25519");
if (id == NULL) { if (id == NULL) {
goto err; goto err;
} }
rc = ssh_list_append(session->opts.identity, id); rc = ssh_list_append(session->opts.identity, id);
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
goto err; goto err;
} }
#ifdef HAVE_ECC #ifdef HAVE_ECC
id = strdup("%d/id_ecdsa"); id = strdup("%d/id_ecdsa");
if (id == NULL) { if (id == NULL) {
goto err; goto err;
} }
rc = ssh_list_append(session->opts.identity, id); rc = ssh_list_append(session->opts.identity, id);
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
goto err; goto err;
} }
#endif #endif
id = strdup("%d/id_rsa"); id = strdup("%d/id_rsa");
if (id == NULL) { if (id == NULL) {
goto err; goto err;
} }
rc = ssh_list_append(session->opts.identity, id); rc = ssh_list_append(session->opts.identity, id);
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
goto err; goto err;
} }
#ifdef HAVE_DSA #ifdef HAVE_DSA
id = strdup("%d/id_dsa"); id = strdup("%d/id_dsa");
if (id == NULL) { if (id == NULL) {
goto err; goto err;
} }
rc = ssh_list_append(session->opts.identity, id); rc = ssh_list_append(session->opts.identity, id);
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
goto err; goto err;
} }
#endif #endif