generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved error handling

Browse Source
This commit is contained in:
Bert Vermeulen 2005-01-25 06:03:16 +00:00
parent b59f2ccc1b
commit 4675d1242b
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/methods.c
View File

@ -121,7 +121,7 @@ static void dump_methods(LIBSSH2_SESSION *session)
static void cycle_methods(void) static void cycle_methods(void)
{ {
LIBSSH2_SESSION *session; LIBSSH2_SESSION *session;
int sock, size, res, method_type, method, i; int sock, size, res, method_type, method, i, methods_set;
char *errmsg; char *errmsg;
method_type = 0; method_type = 0;
@ -140,8 +140,7 @@ static void cycle_methods(void)
session = libssh2_session_init(); session = libssh2_session_init();
methods_set = 1;
for(i = 0; methods[i].description; i++) for(i = 0; methods[i].description; i++)
{ {
res = libssh2_session_method_pref(session, methods[i].method_type, res = libssh2_session_method_pref(session, methods[i].method_type,
@ -152,12 +151,16 @@ static void cycle_methods(void)
log_line(ERROR, "%s method set to '%s' failed: %s\n", log_line(ERROR, "%s method set to '%s' failed: %s\n",
methods[i].description, methods[i].description,
methods[i].list[ i == method_type ? method : 0 ], errmsg); methods[i].list[ i == method_type ? method : 0 ], errmsg);
return;
methods_set = 0;
break;
} }
i++; i++;
} }
if(methods_set)
{
res = libssh2_session_startup(session, sock); res = libssh2_session_startup(session, sock);
if(res == 0) if(res == 0)
{ {
@ -171,9 +174,10 @@ static void cycle_methods(void)
else else
{ {
libssh2_session_last_error(session, &errmsg, &size, 0); libssh2_session_last_error(session, &errmsg, &size, 0);
log_line(ERROR, "session startup for %s method %s failed: %s\n", log_line(ERROR, "Session startup for %s method %s failed: %s\n",
methods[method_type].description, methods[method_type].list[method], errmsg); methods[method_type].description, methods[method_type].list[method], errmsg);
} }
}
libssh2_session_disconnect(session, "All done."); libssh2_session_disconnect(session, "All done.");
libssh2_session_free(session); libssh2_session_free(session);
@ -202,7 +206,7 @@ void runtest_methods(void)
} }
num_steps++; num_steps++;
init_test("kex/hostkey/crypt/max/compression methods", num_steps); init_test("kex/hostkey/crypt/mac/compression methods", num_steps);
cycle_methods(); cycle_methods();