github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

sftp: Guard sftp code with HAVE_LIBSSH2

pull/384/head
Tatsuhiro Tsujikawa 2015-05-12 00:37:21 +09:00
parent 21c328fc11
commit 46595e77d7
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/FtpInitiateConnectionCommand.cc
View File

@ -132,6 +132,7 @@ std::unique_ptr<Command> FtpInitiateConnectionCommand::createNextCommandProxied
setConnectedAddrInfo(getRequest(), hostname, pooledSocket); setConnectedAddrInfo(getRequest(), hostname, pooledSocket);
if(proxyMethod == V_TUNNEL) { if(proxyMethod == V_TUNNEL) {
#ifdef HAVE_LIBSSH2
if (getRequest()->getProtocol() == "sftp") { if (getRequest()->getProtocol() == "sftp") {
return make_unique<SftpNegotiationCommand> return make_unique<SftpNegotiationCommand>
(getCuid(), (getCuid(),
@ -142,6 +143,7 @@ std::unique_ptr<Command> FtpInitiateConnectionCommand::createNextCommandProxied
pooledSocket, pooledSocket,
SftpNegotiationCommand::SEQ_SFTP_OPEN); SftpNegotiationCommand::SEQ_SFTP_OPEN);
} }
#endif // HAVE_LIBSSH2
// options contains "baseWorkingDir" // options contains "baseWorkingDir"
return make_unique<FtpNegotiationCommand> return make_unique<FtpNegotiationCommand>
@ -206,7 +208,11 @@ std::unique_ptr<Command> FtpInitiateConnectionCommand::createNextCommandPlain
getSocket()); getSocket());
if(getRequest()->getProtocol() == "sftp") { if(getRequest()->getProtocol() == "sftp") {
#ifdef HAVE_LIBSSH2
c->setControlChain(std::make_shared<SftpNegotiationConnectChain>()); c->setControlChain(std::make_shared<SftpNegotiationConnectChain>());
#else // !HAVE_LIBSSH2
assert(0);
#endif // !HAVE_LIBSSH2
} else { } else {
c->setControlChain(std::make_shared<FtpNegotiationConnectChain>()); c->setControlChain(std::make_shared<FtpNegotiationConnectChain>());
} }
@ -216,6 +222,7 @@ std::unique_ptr<Command> FtpInitiateConnectionCommand::createNextCommandPlain
setConnectedAddrInfo(getRequest(), hostname, pooledSocket); setConnectedAddrInfo(getRequest(), hostname, pooledSocket);
#ifdef HAVE_LIBSSH2
if (getRequest()->getProtocol() == "sftp") { if (getRequest()->getProtocol() == "sftp") {
return make_unique<SftpNegotiationCommand> return make_unique<SftpNegotiationCommand>
(getCuid(), (getCuid(),
@ -226,6 +233,7 @@ std::unique_ptr<Command> FtpInitiateConnectionCommand::createNextCommandPlain
pooledSocket, pooledSocket,
SftpNegotiationCommand::SEQ_SFTP_OPEN); SftpNegotiationCommand::SEQ_SFTP_OPEN);
} }
#endif // HAVE_LIBSSH2
// options contains "baseWorkingDir" // options contains "baseWorkingDir"
return make_unique<FtpNegotiationCommand> return make_unique<FtpNegotiationCommand>

6
src/FtpTunnelResponseCommand.cc
View File

@ -40,7 +40,9 @@
#include "Segment.h" #include "Segment.h"
#include "SocketCore.h" #include "SocketCore.h"
#include "SocketRecvBuffer.h" #include "SocketRecvBuffer.h"
#include "SftpNegotiationCommand.h" #ifdef HAVE_LIBSSH2
# include "SftpNegotiationCommand.h"
#endif // HAVE_LIBSSH2
namespace aria2 { namespace aria2 {
@ -60,12 +62,14 @@ FtpTunnelResponseCommand::~FtpTunnelResponseCommand() {}
std::unique_ptr<Command> FtpTunnelResponseCommand::getNextCommand() std::unique_ptr<Command> FtpTunnelResponseCommand::getNextCommand()
{ {
#ifdef HAVE_LIBSSH2
if (getRequest()->getProtocol() == "sftp") { if (getRequest()->getProtocol() == "sftp") {
return make_unique<SftpNegotiationCommand> return make_unique<SftpNegotiationCommand>
(getCuid(), getRequest(), getFileEntry(), (getCuid(), getRequest(), getFileEntry(),
getRequestGroup(), getDownloadEngine(), getRequestGroup(), getDownloadEngine(),
getSocket()); getSocket());
} }
#endif // HAVE_LIBSSH2
return make_unique<FtpNegotiationCommand> return make_unique<FtpNegotiationCommand>
(getCuid(), getRequest(), getFileEntry(), (getCuid(), getRequest(), getFileEntry(),