lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-23 01:22:37 +03:00
Code Activity

session: avoid printing misleading debug messages

Browse Source 
... while throwing LIBSSH2_ERROR_EAGAIN out of session_startup()

If the session runs in blocking mode, LIBSSH2_ERROR_EAGAIN never reaches
the libssh2 API boundary and, in non-blocking mode, these messages are
suppressed by the condition in _libssh2_error_flags() anyway.

Closes #211
This commit is contained in:
Kamil Dudka
2017-10-09 17:35:51 +02:00
parent 1d0e694d7d
commit 712c6cbdd2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/session.c
View File

@@ -703,7 +703,9 @@ session_startup(LIBSSH2_SESSION *session, libssh2_socket_t sock)
if (session->startup_state == libssh2_NB_state_created) {
rc = banner_send(session);
if (rc) {
if (rc == LIBSSH2_ERROR_EAGAIN)
return rc;
else if (rc) {
return _libssh2_error(session, rc,
"Failed sending banner");
}
@@ -714,7 +716,9 @@ session_startup(LIBSSH2_SESSION *session, libssh2_socket_t sock)
if (session->startup_state == libssh2_NB_state_sent) {
do {
rc = banner_receive(session);
if (rc)
if (rc == LIBSSH2_ERROR_EAGAIN)
return rc;
else if (rc)
return _libssh2_error(session, rc,
"Failed getting banner");
} while(strncmp("SSH-", (char *)session->remote.banner, 4));
@@ -724,7 +728,9 @@ session_startup(LIBSSH2_SESSION *session, libssh2_socket_t sock)
if (session->startup_state == libssh2_NB_state_sent1) {
rc = _libssh2_kex_exchange(session, 0, &session->startup_key_state);
if (rc)
if (rc == LIBSSH2_ERROR_EAGAIN)
return rc;
else if (rc)
return _libssh2_error(session, rc,
"Unable to exchange encryption keys");
@@ -749,7 +755,9 @@ session_startup(LIBSSH2_SESSION *session, libssh2_socket_t sock)
rc = _libssh2_transport_send(session, session->startup_service,
sizeof("ssh-userauth") + 5 - 1,
NULL, 0);
if (rc) {
if (rc == LIBSSH2_ERROR_EAGAIN)
return rc;
else if (rc) {
return _libssh2_error(session, rc,
"Unable to ask for ssh-userauth service");
}