moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

changed ssh.c to use HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION define provided by libssh2.h; removed related define block from ssh.h.

Browse Source
This commit is contained in:
Gunter Knauf 2009-05-19 23:21:25 +00:00
parent de7a14003c
commit 1bb68cbcfa
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ssh.c
View File

@ -2096,7 +2096,7 @@ static int ssh_perform_getsock(const struct connectdata *conn,
number of sockets */ number of sockets */
int numsocks) int numsocks)
{ {
#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS #ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION
int bitmap = GETSOCK_BLANK; int bitmap = GETSOCK_BLANK;
(void)numsocks; (void)numsocks;
@ -2123,7 +2123,7 @@ static int ssh_getsock(struct connectdata *conn,
of sockets */ of sockets */
int numsocks) int numsocks)
{ {
#ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS #ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION
(void)conn; (void)conn;
(void)sock; (void)sock;
(void)numsocks; (void)numsocks;
@ -2137,7 +2137,7 @@ static int ssh_getsock(struct connectdata *conn,
#endif #endif
} }
#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS #ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION
/* /*
* When one of the libssh2 functions has returned LIBSSH2_ERROR_EAGAIN this * When one of the libssh2 functions has returned LIBSSH2_ERROR_EAGAIN this
* function is used to figure out in what direction and stores this info so * function is used to figure out in what direction and stores this info so
@ -2188,7 +2188,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn)
bool block; bool block;
result = ssh_statemach_act(conn, &block); result = ssh_statemach_act(conn, &block);
#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS #ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION
if((CURLE_OK == result) && block) { if((CURLE_OK == result) && block) {
int dir = libssh2_session_block_directions(sshc->ssh_session); int dir = libssh2_session_block_directions(sshc->ssh_session);
curl_socket_t sock = conn->sock[FIRSTSOCKET]; curl_socket_t sock = conn->sock[FIRSTSOCKET];

10
lib/ssh.h
View File

@ -29,16 +29,6 @@
# error "SCP/SFTP protocols require libssh2 0.16 or later" # error "SCP/SFTP protocols require libssh2 0.16 or later"
#endif #endif
#if defined(LIBSSH2_VERSION_NUM) && (LIBSSH2_VERSION_NUM >= 0x001300)
/* libssh2 0.19 was the planned release version for a while before it was
decided to instead become 1.0. Thus >= 0x001300 should still work fine
for snapshots done during the 0.19 days as well as things released once
it was bumped to 1.0 */
# define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS 1
#else
# undef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS
#endif
#if defined(LIBSSH2_VERSION_NUM) && (LIBSSH2_VERSION_NUM >= 0x010000) #if defined(LIBSSH2_VERSION_NUM) && (LIBSSH2_VERSION_NUM >= 0x010000)
/* libssh2_sftp_seek64() has only ever been provided by libssh2 1.0 or /* libssh2_sftp_seek64() has only ever been provided by libssh2 1.0 or
later */ later */