mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 13:37:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Consistent naming scheme for hash type and digest for DownloadContext.

Browse source
This commit is contained in:
Tatsuhiro Tsujikawa 2011-07-27 22:44:30 +09:00
parent 7b86b294c9
commit 03f0774482
15 changed files with 51 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/HttpResponseCommand.cc
View file

@ -213,12 +213,11 @@ bool HttpResponseCommand::executeInternal()
httpResponse->getDigest(checksums);
for(std::vector<Checksum>::iterator i = checksums.begin(),
eoi = checksums.end(); i != eoi; ++i) {
if(getDownloadContext()->getChecksumHashAlgo().empty()) {
if(getDownloadContext()->getHashType().empty()) {
A2_LOG_DEBUG(fmt("Setting digest: type=%s, digest=%s",
(*i).getHashType().c_str(),
(*i).getDigest().c_str()));
getDownloadContext()->setChecksumHashAlgo((*i).getHashType());
getDownloadContext()->setChecksum((*i).getDigest());
getDownloadContext()->setDigest((*i).getHashType(), (*i).getDigest());
break;
} else {
if(checkChecksum(getDownloadContext(), *i)) {
@ -282,7 +281,7 @@ bool HttpResponseCommand::executeInternal()
}
} else {
#ifdef ENABLE_MESSAGE_DIGEST
if(!getDownloadContext()->getChecksumHashAlgo().empty() &&
if(!getDownloadContext()->getHashType().empty() &&
httpHeader->defined(HttpHeader::DIGEST)) {
std::vector<Checksum> checksums;
httpResponse->getDigest(checksums);
@ -559,8 +558,8 @@ bool HttpResponseCommand::checkChecksum
(const SharedHandle<DownloadContext>& dctx,
const Checksum& checksum)
{
if(dctx->getChecksumHashAlgo() == checksum.getHashType()) {
if(dctx->getChecksum() == checksum.getDigest()) {
if(dctx->getHashType() == checksum.getHashType()) {
if(dctx->getDigest() == checksum.getDigest()) {
A2_LOG_INFO("Valid hash found in Digest header field.");
return true;
} else {