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

Fixed compile error with --disable-bittorrent

pull/1/head
Tatsuhiro Tsujikawa 2011-03-17 16:02:35 +09:00
parent 6e818a06dc
commit 821dbbff1f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/RpcMethodImpl.cc
View File

@ -64,6 +64,10 @@
#include "TimedHaltCommand.h" #include "TimedHaltCommand.h"
#include "PeerStat.h" #include "PeerStat.h"
#include "Base64.h" #include "Base64.h"
#ifdef ENABLE_MESSAGE_DIGEST
# include "MessageDigest.h"
# include "message_digest_helper.h"
#endif // ENABLE_MESSAGE_DIGEST
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
# include "bittorrent_helper.h" # include "bittorrent_helper.h"
# include "BtRegistry.h" # include "BtRegistry.h"
@ -71,8 +75,6 @@
# include "Peer.h" # include "Peer.h"
# include "BtRuntime.h" # include "BtRuntime.h"
# include "BtAnnounce.h" # include "BtAnnounce.h"
# include "MessageDigest.h"
# include "message_digest_helper.h"
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
namespace aria2 { namespace aria2 {
@ -247,8 +249,8 @@ SharedHandle<ValueBase> AddUriRpcMethod::process
} }
} }
#ifdef ENABLE_MESSAGE_DIGEST
namespace { namespace {
std::string getHexSha1(const std::string& s) std::string getHexSha1(const std::string& s)
{ {
unsigned char hash[20]; unsigned char hash[20];
@ -256,8 +258,8 @@ std::string getHexSha1(const std::string& s)
s.data(), s.size()); s.data(), s.size());
return util::toHex(hash, sizeof(hash)); return util::toHex(hash, sizeof(hash));
} }
} // namespace } // namespace
#endif // ENABLE_MESSAGE_DIGEST
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
SharedHandle<ValueBase> AddTorrentRpcMethod::process SharedHandle<ValueBase> AddTorrentRpcMethod::process
@ -326,13 +328,14 @@ SharedHandle<ValueBase> AddMetalinkRpcMethod::process
bool posGiven = false; bool posGiven = false;
getPosParam(req, 2, posGiven, pos); getPosParam(req, 2, posGiven, pos);
std::vector<SharedHandle<RequestGroup> > result;
#ifdef ENABLE_MESSAGE_DIGEST
// TODO RFC5854 Metalink has the extension .meta4 and Metalink // TODO RFC5854 Metalink has the extension .meta4 and Metalink
// Version 3 uses .metalink extension. We use .meta4 for both // Version 3 uses .metalink extension. We use .meta4 for both
// RFC5854 Metalink and Version 3. aria2 can detect which of which // RFC5854 Metalink and Version 3. aria2 can detect which of which
// by reading content rather than extension. // by reading content rather than extension.
std::string filename = util::applyDir std::string filename = util::applyDir
(requestOption->get(PREF_DIR), getHexSha1(metalinkParam->s())+".meta4"); (requestOption->get(PREF_DIR), getHexSha1(metalinkParam->s())+".meta4");
std::vector<SharedHandle<RequestGroup> > result;
// Save uploaded data in order to save this download in // Save uploaded data in order to save this download in
// --save-session file. // --save-session file.
if(util::saveAs(filename, metalinkParam->s(), true)) { if(util::saveAs(filename, metalinkParam->s(), true)) {
@ -345,6 +348,9 @@ SharedHandle<ValueBase> AddMetalinkRpcMethod::process
" Failed to write file %s", filename.c_str())); " Failed to write file %s", filename.c_str()));
createRequestGroupForMetalink(result, requestOption, metalinkParam->s()); createRequestGroupForMetalink(result, requestOption, metalinkParam->s());
} }
#else // !ENABLE_MESSAGE_DIGEST
createRequestGroupForMetalink(result, requestOption, metalinkParam->s());
#endif // !ENABLE_MESSAGE_DIGEST
SharedHandle<List> gids = List::g(); SharedHandle<List> gids = List::g();
if(!result.empty()) { if(!result.empty()) {
if(posGiven) { if(posGiven) {