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

session: Fix timeout handling.

Browse Source 
-2 now means to use the timeout specified in options. It wasn't used
earlier and poll only knows -1 and 0 anyway for special meanings.
(cherry picked from commit af85337f5f)
This commit is contained in:
rofl0r
2011-08-05 03:00:21 +02:00
committed by Andreas Schneider
parent a1ef27c0b8
commit 61a97ccede
7 changed files with 87 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/auth.c
View File

@@ -62,23 +62,23 @@
* again is necessary
*/
static int ask_userauth(ssh_session session) {
int rc = 0;
int rc = 0;
enter_function();
do {
rc=ssh_service_request(session,"ssh-userauth");
if(ssh_is_blocking(session)){
if(rc==SSH_AGAIN)
ssh_handle_packets(session,-1);
} else {
/* nonblocking */
ssh_handle_packets(session,0);
rc=ssh_service_request(session,"ssh-userauth");
break;
}
} while(rc==SSH_AGAIN);
leave_function();
return rc;
enter_function();
do {
rc = ssh_service_request(session,"ssh-userauth");
if (ssh_is_blocking(session)) {
if(rc == SSH_AGAIN)
ssh_handle_packets(session, -2);
} else {
/* nonblocking */
ssh_handle_packets(session, 0);
rc = ssh_service_request(session, "ssh-userauth");
break;
}
} while (rc == SSH_AGAIN);
leave_function();
return rc;
}
/**