diff --git a/ChangeLog b/ChangeLog index ff03353e..e2baa12c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-31 Tatsuhiro Tsujikawa + + Fixed the bug that the average speed is wrong in + http/ftp/BitTorrent integrated download. Only the download bytes + in BitTorrent were considered. + * src/RequestGroup.cc + 2009-01-31 Tatsuhiro Tsujikawa Choose port for BitTorrent/DHT randomly from the specified range. diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index 30c9572e..9e246446 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -895,14 +895,14 @@ DownloadResultHandle RequestGroup::createDownloadResult() const #ifdef ENABLE_BITTORRENT if(!_peerStorage.isNull()) { - sessionDownloadLength = + sessionDownloadLength += _peerStorage->calculateStat().getSessionDownloadLength(); - } else + } #endif // ENABLE_BITTORRENT - if(!_segmentMan.isNull()) { - sessionDownloadLength = - _segmentMan->calculateSessionDownloadLength(); - } + if(!_segmentMan.isNull()) { + sessionDownloadLength += + _segmentMan->calculateSessionDownloadLength(); + } return SharedHandle