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

2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed the bug that POU peers are never choked in seeding.
	* src/BtSeederStateChoke.cc
	* src/BtSeederStateChoke.h
pull/1/head
Tatsuhiro Tsujikawa 2009-05-13 14:10:20 +00:00
parent 9b9295ce4a
commit eb0cb42c72
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed the bug that POU peers are never choked in seeding.
* src/BtSeederStateChoke.cc
* src/BtSeederStateChoke.h
2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added web-seeding URI handling in addTorrent command. Added web-seeding URI handling in addTorrent command.

20
src/BtSeederStateChoke.cc
View File

@ -87,6 +87,11 @@ unsigned int BtSeederStateChoke::PeerEntry::getUploadSpeed() const
return _uploadSpeed; return _uploadSpeed;
} }
void BtSeederStateChoke::PeerEntry::disableOptUnchoking()
{
_peer->optUnchoking(false);
}
void BtSeederStateChoke::unchoke void BtSeederStateChoke::unchoke
(std::deque<BtSeederStateChoke::PeerEntry>& peers) (std::deque<BtSeederStateChoke::PeerEntry>& peers)
{ {
@ -100,11 +105,16 @@ void BtSeederStateChoke::unchoke
_logger->info("RU: %s, ulspd=%u", (*r).getPeer()->ipaddr.c_str(), _logger->info("RU: %s, ulspd=%u", (*r).getPeer()->ipaddr.c_str(),
(*r).getUploadSpeed()); (*r).getUploadSpeed());
} }
if(_round == 2 && r != peers.end()) {
std::random_shuffle(r, peers.end(), if(_round == 2) {
*(SimpleRandomizer::getInstance().get())); std::for_each(peers.begin(), peers.end(),
(*r).getPeer()->optUnchoking(true); std::mem_fun_ref(&PeerEntry::disableOptUnchoking));
_logger->info("POU: %s", (*r).getPeer()->ipaddr.c_str()); if(r != peers.end()) {
std::random_shuffle(r, peers.end(),
*(SimpleRandomizer::getInstance().get()));
(*r).getPeer()->optUnchoking(true);
_logger->info("POU: %s", (*r).getPeer()->ipaddr.c_str());
}
} }
} }

2
src/BtSeederStateChoke.h
View File

@ -72,6 +72,8 @@ private:
SharedHandle<Peer> getPeer() const; SharedHandle<Peer> getPeer() const;
unsigned int getUploadSpeed() const; unsigned int getUploadSpeed() const;
void disableOptUnchoking();
}; };
void unchoke(std::deque<PeerEntry>& peers); void unchoke(std::deque<PeerEntry>& peers);