Make sftp_nonblock.c a non-blocking version of sftp.c, just like sftpdir.c
This commit is contained in:
parent
08fd7e259b
commit
3bd3eb35b3
@ -1,7 +1,7 @@
|
|||||||
AUTOMAKE_OPTIONS = foreign nostdinc
|
AUTOMAKE_OPTIONS = foreign nostdinc
|
||||||
|
|
||||||
# samples
|
# samples
|
||||||
noinst_PROGRAMS = ssh2 scp_nonblock sftp_nonblock sftp scp sftpdir sftpdir_nonblock
|
noinst_PROGRAMS = ssh2 scp_nonblock sftp_nonblock sftp sftp_RW_nonblock scp sftpdir sftpdir_nonblock
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/include
|
INCLUDES = -I$(top_srcdir)/include
|
||||||
LDADD = $(top_builddir)/src/libssh2.la
|
LDADD = $(top_builddir)/src/libssh2.la
|
||||||
@ -16,6 +16,8 @@ scp_nonblock_SOURCES = scp_nonblock.c
|
|||||||
|
|
||||||
sftp_nonblock_SOURCES = sftp_nonblock.c
|
sftp_nonblock_SOURCES = sftp_nonblock.c
|
||||||
|
|
||||||
|
sftp_RW_nonblock_SOURCES = sftp_RW_nonblock.c
|
||||||
|
|
||||||
sftpdir_nonblock_SOURCES = sftpdir_nonblock.c
|
sftpdir_nonblock_SOURCES = sftpdir_nonblock.c
|
||||||
|
|
||||||
scp_SOURCES = scp.c
|
scp_SOURCES = scp.c
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: sftp_nonblock.c,v 1.1 2007/02/02 16:21:20 bagder Exp $
|
* $Id: sftp_nonblock.c,v 1.2 2007/04/22 14:16:26 jehousley Exp $
|
||||||
*
|
*
|
||||||
* Sample showing how to do SFTP transfers in a non-blocking manner.
|
* Sample showing how to do SFTP transfers.
|
||||||
*
|
*
|
||||||
* It will first download a given source file, store it locally and then
|
* The sample code has default values for host name, user name, password
|
||||||
* upload the file again to a given destination file.
|
* and path to copy, but you can specify them on the command line like:
|
||||||
*
|
*
|
||||||
* Using the SFTP server running on 127.0.0.1
|
* "sftp 192.168.0.1 user password /tmp/secrets"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <libssh2.h>
|
#include <libssh2.h>
|
||||||
@ -16,266 +16,172 @@
|
|||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
# include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
|
# include <arpa/inet.h>
|
||||||
#else
|
#else
|
||||||
# include <winsock2.h>
|
# include <winsock2.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#define STORAGE "/tmp/sftp-storage" /* this is the local file name this
|
|
||||||
example uses to store the downloaded
|
|
||||||
file in */
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
int sock, i, auth_pw = 1;
|
unsigned long hostaddr;
|
||||||
struct sockaddr_in sin;
|
int sock, i, auth_pw = 1;
|
||||||
const char *fingerprint;
|
struct sockaddr_in sin;
|
||||||
LIBSSH2_SESSION *session;
|
const char *fingerprint;
|
||||||
char *username=(char *)"username";
|
LIBSSH2_SESSION *session;
|
||||||
char *password=(char *)"password";
|
char *username=(char *)"username";
|
||||||
char *sftppath=(char *)"/tmp/TEST"; /* source path */
|
char *password=(char *)"password";
|
||||||
char *dest=(char *)"/tmp/TEST2"; /* destination path */
|
char *sftppath=(char *)"/tmp/TEST";
|
||||||
int rc;
|
int rc;
|
||||||
LIBSSH2_SFTP *sftp_session;
|
LIBSSH2_SFTP *sftp_session;
|
||||||
LIBSSH2_SFTP_HANDLE *sftp_handle;
|
LIBSSH2_SFTP_HANDLE *sftp_handle;
|
||||||
FILE *tempstorage;
|
|
||||||
char mem[1000];
|
|
||||||
struct timeval timeout;
|
|
||||||
fd_set fd;
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
WSADATA wsadata;
|
WSADATA wsadata;
|
||||||
|
|
||||||
WSAStartup(WINSOCK_VERSION, &wsadata);
|
WSAStartup(WINSOCK_VERSION, &wsadata);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ultra basic "connect to port 22 on localhost"
|
if (argc > 1) {
|
||||||
* The application is responsible for creating the socket establishing
|
hostaddr = inet_addr(argv[1]);
|
||||||
* the connection
|
} else {
|
||||||
*/
|
hostaddr = htonl(0x7F000001);
|
||||||
sock = socket(AF_INET, SOCK_STREAM, 0);
|
}
|
||||||
|
|
||||||
sin.sin_family = AF_INET;
|
if(argc > 2) {
|
||||||
sin.sin_port = htons(22);
|
username = argv[2];
|
||||||
sin.sin_addr.s_addr = htonl(0x7F000001);
|
}
|
||||||
if (connect(sock, (struct sockaddr*)(&sin),
|
if(argc > 3) {
|
||||||
sizeof(struct sockaddr_in)) != 0) {
|
password = argv[3];
|
||||||
fprintf(stderr, "failed to connect!\n");
|
}
|
||||||
return -1;
|
if(argc > 4) {
|
||||||
}
|
sftppath = argv[4];
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* The application code is responsible for creating the socket
|
||||||
|
* and establishing the connection
|
||||||
|
*/
|
||||||
|
sock = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
|
||||||
/* We set the socket non-blocking. We do it after the connect just to
|
sin.sin_family = AF_INET;
|
||||||
simplify the example code. */
|
sin.sin_port = htons(22);
|
||||||
|
sin.sin_addr.s_addr = hostaddr;
|
||||||
|
if (connect(sock, (struct sockaddr*)(&sin),
|
||||||
|
sizeof(struct sockaddr_in)) != 0) {
|
||||||
|
fprintf(stderr, "failed to connect!\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* We set the socket non-blocking. We do it after the connect just to
|
||||||
|
simplify the example code. */
|
||||||
#ifdef F_SETFL
|
#ifdef F_SETFL
|
||||||
/* FIXME: this can/should be done in a more portable manner */
|
/* FIXME: this can/should be done in a more portable manner */
|
||||||
rc = fcntl(sock, F_GETFL, 0);
|
rc = fcntl(sock, F_GETFL, 0);
|
||||||
fcntl(sock, F_SETFL, rc | O_NONBLOCK);
|
fcntl(sock, F_SETFL, rc | O_NONBLOCK);
|
||||||
#else
|
#else
|
||||||
#error "add support for setting the socket non-blocking here"
|
#error "add support for setting the socket non-blocking here"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Create a session instance
|
/* Create a session instance
|
||||||
*/
|
*/
|
||||||
session = libssh2_session_init();
|
session = libssh2_session_init();
|
||||||
if(!session)
|
if(!session)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* ... start it up. This will trade welcome banners, exchange keys,
|
/* ... start it up. This will trade welcome banners, exchange keys,
|
||||||
* and setup crypto, compression, and MAC layers
|
* and setup crypto, compression, and MAC layers
|
||||||
*/
|
*/
|
||||||
rc = libssh2_session_startup(session, sock);
|
rc = libssh2_session_startup(session, sock);
|
||||||
if(rc) {
|
if(rc) {
|
||||||
fprintf(stderr, "Failure establishing SSH session: %d\n", rc);
|
fprintf(stderr, "Failure establishing SSH session: %d\n", rc);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* At this point we havn't yet authenticated. The first thing to do
|
||||||
|
* is check the hostkey's fingerprint against our known hosts Your app
|
||||||
|
* may have it hard coded, may go to a file, may present it to the
|
||||||
|
* user, that's your call
|
||||||
|
*/
|
||||||
|
fingerprint = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5);
|
||||||
|
printf("Fingerprint: ");
|
||||||
|
for(i = 0; i < 16; i++) {
|
||||||
|
printf("%02X ", (unsigned char)fingerprint[i]);
|
||||||
|
}
|
||||||
|
printf("\n");
|
||||||
|
|
||||||
|
if (auth_pw) {
|
||||||
|
/* We could authenticate via password */
|
||||||
|
if (libssh2_userauth_password(session, username, password)) {
|
||||||
|
printf("Authentication by password failed.\n");
|
||||||
|
goto shutdown;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* Or by public key */
|
||||||
|
if (libssh2_userauth_publickey_fromfile(session, username,
|
||||||
|
"/home/username/.ssh/id_rsa.pub",
|
||||||
|
"/home/username/.ssh/id_rsa",
|
||||||
|
password)) {
|
||||||
|
printf("\tAuthentication by public key failed\n");
|
||||||
|
goto shutdown;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(stderr, "libssh2_sftp_init()!\n");
|
||||||
|
sftp_session = libssh2_sftp_init(session);
|
||||||
|
|
||||||
|
if (!sftp_session) {
|
||||||
|
fprintf(stderr, "Unable to init SFTP session\n");
|
||||||
|
goto shutdown;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Since we have set non-blocking, tell libssh2 we are non-blocking */
|
||||||
|
libssh2_sftp_set_blocking(sftp_session, 0);
|
||||||
|
|
||||||
|
fprintf(stderr, "libssh2_sftp_open()!\n");
|
||||||
|
/* Request a file via SFTP */
|
||||||
|
sftp_handle =
|
||||||
|
libssh2_sftp_open(sftp_session, sftppath, LIBSSH2_FXF_READ, 0);
|
||||||
|
|
||||||
|
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");
|
||||||
|
do {
|
||||||
|
char mem[1024];
|
||||||
|
|
||||||
|
/* loop until we fail */
|
||||||
|
fprintf(stderr, "libssh2_sftp_read()!\n");
|
||||||
|
rc = libssh2_sftp_read(sftp_handle, mem, sizeof(mem));
|
||||||
|
if (rc > 0) {
|
||||||
|
write(2, mem, rc);
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
} while (1);
|
||||||
|
|
||||||
/* At this point we havn't yet authenticated. The first thing to do
|
libssh2_sftp_close(sftp_handle);
|
||||||
* is check the hostkey's fingerprint against our known hosts Your app
|
libssh2_sftp_shutdown(sftp_session);
|
||||||
* may have it hard coded, may go to a file, may present it to the
|
|
||||||
* user, that's your call
|
|
||||||
*/
|
|
||||||
fingerprint = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5);
|
|
||||||
printf("Fingerprint: ");
|
|
||||||
for(i = 0; i < 16; i++) {
|
|
||||||
printf("%02X ", (unsigned char)fingerprint[i]);
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
|
|
||||||
if(argc > 1) {
|
|
||||||
username = argv[1];
|
|
||||||
}
|
|
||||||
if(argc > 2) {
|
|
||||||
password = argv[2];
|
|
||||||
}
|
|
||||||
if(argc > 3) {
|
|
||||||
sftppath = argv[3];
|
|
||||||
}
|
|
||||||
if(argc > 4) {
|
|
||||||
dest = argv[4];
|
|
||||||
}
|
|
||||||
|
|
||||||
tempstorage = fopen(STORAGE, "wb");
|
|
||||||
if(!tempstorage) {
|
|
||||||
printf("Can't open temp storage file %s\n", STORAGE);
|
|
||||||
goto shutdown;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (auth_pw) {
|
|
||||||
/* We could authenticate via password */
|
|
||||||
if (libssh2_userauth_password(session, username, password)) {
|
|
||||||
printf("Authentication by password failed.\n");
|
|
||||||
goto shutdown;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/* Or by public key */
|
|
||||||
if (libssh2_userauth_publickey_fromfile(session, username,
|
|
||||||
"/home/username/.ssh/id_rsa.pub",
|
|
||||||
"/home/username/.ssh/id_rsa",
|
|
||||||
password)) {
|
|
||||||
printf("\tAuthentication by public key failed\n");
|
|
||||||
goto shutdown;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sftp_session = libssh2_sftp_init(session);
|
|
||||||
|
|
||||||
if (!sftp_session) {
|
|
||||||
fprintf(stderr, "Unable to init SFTP session\n");
|
|
||||||
goto shutdown;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Request a file via SFTP */
|
|
||||||
sftp_handle =
|
|
||||||
libssh2_sftp_open(sftp_session, sftppath, LIBSSH2_FXF_READ, 0);
|
|
||||||
|
|
||||||
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");
|
|
||||||
do {
|
|
||||||
do {
|
|
||||||
/* read in a loop until we block */
|
|
||||||
rc = libssh2_sftp_readnb(sftp_handle, mem,
|
|
||||||
sizeof(mem));
|
|
||||||
fprintf(stderr, "libssh2_sftp_read returned %d\n",
|
|
||||||
rc);
|
|
||||||
|
|
||||||
if(rc > 0) {
|
|
||||||
/* write to stderr */
|
|
||||||
write(2, mem, rc);
|
|
||||||
/* write to temporary storage area */
|
|
||||||
fwrite(mem, rc, 1, tempstorage);
|
|
||||||
}
|
|
||||||
} while (rc > 0);
|
|
||||||
|
|
||||||
if(rc != LIBSSH2SFTP_EAGAIN) {
|
|
||||||
/* error or end of file */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
timeout.tv_sec = 10;
|
|
||||||
timeout.tv_usec = 0;
|
|
||||||
|
|
||||||
FD_ZERO(&fd);
|
|
||||||
|
|
||||||
FD_SET(sock, &fd);
|
|
||||||
|
|
||||||
/* wait for readable or writeable */
|
|
||||||
rc = select(sock+1, &fd, &fd, NULL, &timeout);
|
|
||||||
if(rc <= 0) {
|
|
||||||
/* negative is error
|
|
||||||
0 is timeout */
|
|
||||||
fprintf(stderr, "SFTP download timed out: %d\n", rc);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
} while (1);
|
|
||||||
|
|
||||||
libssh2_sftp_close(sftp_handle);
|
|
||||||
fclose(tempstorage);
|
|
||||||
|
|
||||||
tempstorage = fopen(STORAGE, "rb");
|
|
||||||
if(!tempstorage) {
|
|
||||||
/* weird, we can't read the file we just wrote to... */
|
|
||||||
fprintf(stderr, "can't open %s for reading\n", STORAGE);
|
|
||||||
goto shutdown;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* we're done downloading, now reverse the process and upload the
|
|
||||||
temporarily stored data to the destination path */
|
|
||||||
sftp_handle =
|
|
||||||
libssh2_sftp_open(sftp_session, dest,
|
|
||||||
LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT,
|
|
||||||
LIBSSH2_SFTP_S_IRUSR|LIBSSH2_SFTP_S_IWUSR|
|
|
||||||
LIBSSH2_SFTP_S_IRGRP|LIBSSH2_SFTP_S_IROTH);
|
|
||||||
if(sftp_handle) {
|
|
||||||
size_t nread;
|
|
||||||
char *ptr;
|
|
||||||
do {
|
|
||||||
nread = fread(mem, 1, sizeof(mem), tempstorage);
|
|
||||||
if(nread <= 0) {
|
|
||||||
/* end of file */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ptr = mem;
|
|
||||||
|
|
||||||
do {
|
|
||||||
/* write data in a loop until we block */
|
|
||||||
rc = libssh2_sftp_writenb(sftp_handle, ptr,
|
|
||||||
nread);
|
|
||||||
ptr += rc;
|
|
||||||
nread -= nread;
|
|
||||||
} while (rc > 0);
|
|
||||||
|
|
||||||
if(rc != LIBSSH2SFTP_EAGAIN) {
|
|
||||||
/* error or end of file */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
timeout.tv_sec = 10;
|
|
||||||
timeout.tv_usec = 0;
|
|
||||||
|
|
||||||
FD_ZERO(&fd);
|
|
||||||
|
|
||||||
FD_SET(sock, &fd);
|
|
||||||
|
|
||||||
/* wait for readable or writeable */
|
|
||||||
rc = select(sock+1, &fd, &fd, NULL, &timeout);
|
|
||||||
if(rc <= 0) {
|
|
||||||
/* negative is error
|
|
||||||
0 is timeout */
|
|
||||||
fprintf(stderr, "SFTP upload timed out: %d\n",
|
|
||||||
rc);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} while (1);
|
|
||||||
fprintf(stderr, "SFTP upload done!\n");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
fprintf(stderr, "SFTP failed to open destination path: %s\n",
|
|
||||||
dest);
|
|
||||||
}
|
|
||||||
|
|
||||||
libssh2_sftp_shutdown(sftp_session);
|
|
||||||
|
|
||||||
shutdown:
|
shutdown:
|
||||||
|
|
||||||
libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing");
|
libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing");
|
||||||
libssh2_session_free(session);
|
libssh2_session_free(session);
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
Sleep(1000);
|
Sleep(1000);
|
||||||
closesocket(sock);
|
closesocket(sock);
|
||||||
#else
|
#else
|
||||||
sleep(1);
|
sleep(1);
|
||||||
close(sock);
|
close(sock);
|
||||||
#endif
|
#endif
|
||||||
printf("all done\n");
|
printf("all done\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user