Commit 1bb68cbc authored by Guenter Knauf's avatar Guenter Knauf
Browse files

changed ssh.c to use HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION define provided by... 

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

lib/ssh.c

+4 −4
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ static int ssh_perform_getsock(const struct connectdata *conn, 
                                                       number of sockets */

                               int numsocks)

{

#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS

#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION

  int bitmap = GETSOCK_BLANK;

  (void)numsocks;
@@ -2123,7 +2123,7 @@ static int ssh_getsock(struct connectdata *conn, 
                                               of sockets */

                       int numsocks)

{

#ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS

#ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION

  (void)conn;

  (void)sock;

  (void)numsocks;
@@ -2137,7 +2137,7 @@ static int ssh_getsock(struct connectdata *conn, 
#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

 * 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;

    result = ssh_statemach_act(conn, &block);



#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS

#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION

    if((CURLE_OK == result) && block) {

      int dir = libssh2_session_block_directions(sshc->ssh_session);

      curl_socket_t sock = conn->sock[FIRSTSOCKET];

lib/ssh.h

+0 −10
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ 
#  error "SCP/SFTP protocols require libssh2 0.16 or later"

#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)

/* libssh2_sftp_seek64() has only ever been provided by libssh2 1.0 or

   later */