diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-10-22 14:43:42 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-10-22 14:43:42 +0000 |
| commit | 3349fe081156776aba058b90beebb68d4ee73e75 (patch) | |
| tree | c3dd678e21ea59576a4933e0c052210a22c2cd45 /src/DHTBucket.cc | |
| parent | 7e694d38cb4ab5c5499936af0c3a00701bdbd37e (diff) | |
2009-10-22 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Moved generateRandomData to Util.cc Moved flipBit to bitfield.cc.
Moved generateRandomKey to bittorrent_helper.cc.
* src/DHTBucket.cc
* src/DHTGetPeersMessage.cc
* src/DHTGetPeersReplyMessage.cc
* src/DHTMessage.cc
* src/DHTNode.cc
* src/DHTTokenTracker.cc
* src/DHTUtil.cc: Removed.
* src/DHTUtil.h: Removed.
* src/Makefile.am
* src/Util.cc
* src/Util.h
* src/bitfield.h
* src/bittorrent_helper.cc
* src/bittorrent_helper.h
* test/ARC4Test.cc
* test/BNodeTest.cc
* test/DHTAnnouncePeerMessageTest.cc
* test/DHTAnnouncePeerReplyMessageTest.cc
* test/DHTFindNodeMessageTest.cc
* test/DHTFindNodeReplyMessageTest.cc
* test/DHTGetPeersMessageTest.cc
* test/DHTGetPeersReplyMessageTest.cc
* test/DHTPingMessageTest.cc
* test/DHTPingReplyMessageTest.cc
* test/DHTTokenTrackerTest.cc
* test/DHTUtilTest.cc: Removed.
* test/Makefile.am
* test/UtilTest.cc
Diffstat (limited to 'src/DHTBucket.cc')
| -rw-r--r-- | src/DHTBucket.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index 775fba82..c991aebd 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -38,13 +38,14 @@ #include <cassert> #include <algorithm> -#include "DHTUtil.h" #include "DHTNode.h" #include "LogFactory.h" #include "Logger.h" #include "Util.h" #include "DHTConstants.h" #include "a2functional.h" +#include "bittorrent_helper.h" +#include "bitfield.h" namespace aria2 { @@ -73,10 +74,10 @@ DHTBucket::~DHTBucket() {} void DHTBucket::getRandomNodeID(unsigned char* nodeID) const { if(_prefixLength == 0) { - DHTUtil::generateRandomKey(nodeID); + bittorrent::generateRandomKey(nodeID); } else { size_t lastByteIndex = (_prefixLength-1)/8; - DHTUtil::generateRandomKey(nodeID); + bittorrent::generateRandomKey(nodeID); memcpy(nodeID, _min, lastByteIndex+1); } } @@ -179,11 +180,11 @@ SharedHandle<DHTBucket> DHTBucket::split() unsigned char rMax[DHT_ID_LENGTH]; memcpy(rMax, _max, DHT_ID_LENGTH); - DHTUtil::flipBit(rMax, DHT_ID_LENGTH, _prefixLength); + bitfield::flipBit(rMax, DHT_ID_LENGTH, _prefixLength); unsigned char rMin[DHT_ID_LENGTH]; memcpy(rMin, _min, DHT_ID_LENGTH); - DHTUtil::flipBit(_min, DHT_ID_LENGTH, _prefixLength); + bitfield::flipBit(_min, DHT_ID_LENGTH, _prefixLength); ++_prefixLength; SharedHandle<DHTBucket> rBucket(new DHTBucket(_prefixLength, |