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

example/sftp_RW_nonblock: do not ignore LIBSSH2_ERROR_EAGAIN

Browse Source 
Bug: https://bugzilla.redhat.com/745420
This commit is contained in:
Kamil Dudka 2011-10-24 16:21:25 +02:00 committed by Daniel Stenberg
parent c292378327
commit c0974e5ca3
1 changed files with 71 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
example/sftp_RW_nonblock.c
View File

@ -43,6 +43,36 @@
example uses to store the downloaded example uses to store the downloaded
file in */ file in */
static int waitsocket(int socket_fd, LIBSSH2_SESSION *session)
{
struct timeval timeout;
int rc;
fd_set fd;
fd_set *writefd = NULL;
fd_set *readfd = NULL;
int dir;
timeout.tv_sec = 10;
timeout.tv_usec = 0;
FD_ZERO(&fd);
FD_SET(socket_fd, &fd);
/* now make sure we wait in the correct direction */
dir = libssh2_session_block_directions(session);
if(dir & LIBSSH2_SESSION_BLOCK_INBOUND)
readfd = &fd;
if(dir & LIBSSH2_SESSION_BLOCK_OUTBOUND)
writefd = &fd;
rc = select(socket_fd + 1, readfd, writefd, NULL, &timeout);
return rc;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int sock, i, auth_pw = 1; int sock, i, auth_pw = 1;
@ -138,36 +168,61 @@ int main(int argc, char *argv[])
if (auth_pw) { if (auth_pw) {
/* We could authenticate via password */ /* We could authenticate via password */
if (libssh2_userauth_password(session, username, password)) { while ((rc = libssh2_userauth_password(session, username, password))
== LIBSSH2_ERROR_EAGAIN);
if (rc) {
printf("Authentication by password failed.\n"); printf("Authentication by password failed.\n");
goto shutdown; goto shutdown;
} }
} else { } else {
/* Or by public key */ /* Or by public key */
if (libssh2_userauth_publickey_fromfile(session, username, while ((rc =
"/home/username/.ssh/id_rsa.pub", libssh2_userauth_publickey_fromfile(session, username,
"/home/username/.ssh/id_rsa", "/home/username/"
password)) { ".ssh/id_rsa.pub",
"/home/username/"
".ssh/id_rsa",
password)) ==
LIBSSH2_ERROR_EAGAIN);
if (rc) {
printf("\tAuthentication by public key failed\n"); printf("\tAuthentication by public key failed\n");
goto shutdown; goto shutdown;
} }
} }
sftp_session = libssh2_sftp_init(session); do {
sftp_session = libssh2_sftp_init(session);
if (!sftp_session) { if(!sftp_session) {
fprintf(stderr, "Unable to init SFTP session\n"); if(libssh2_session_last_errno(session) ==
goto shutdown; LIBSSH2_ERROR_EAGAIN) {
} fprintf(stderr, "non-blocking init\n");
waitsocket(sock, session); /* now we wait */
}
else {
fprintf(stderr, "Unable to init SFTP session\n");
goto shutdown;
}
}
} while (!sftp_session);
/* Request a file via SFTP */ /* Request a file via SFTP */
sftp_handle = do {
libssh2_sftp_open(sftp_session, sftppath, LIBSSH2_FXF_READ, 0); sftp_handle = libssh2_sftp_open(sftp_session, sftppath,
LIBSSH2_FXF_READ, 0);
if (!sftp_handle) {
if (libssh2_session_last_errno(session) != LIBSSH2_ERROR_EAGAIN) {
fprintf(stderr, "Unable to open file with SFTP\n");
goto shutdown;
}
else {
fprintf(stderr, "non-blocking open\n");
waitsocket(sock, session); /* now we wait */
}
}
} while (!sftp_handle);
if (!sftp_handle) {
fprintf(stderr, "Unable to open file with SFTP\n");
goto shutdown;
}
fprintf(stderr, "libssh2_sftp_open() is done, now receive data!\n"); fprintf(stderr, "libssh2_sftp_open() is done, now receive data!\n");
do { do {
do { do {