diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-06-13 02:13:43 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-06-13 02:13:43 +0000 |
| commit | 6127307c546cef97d139e9346a712f6ee0eb74af (patch) | |
| tree | 748c899cfc103c5eb026d45c690ef80ccaffc3ad /src/DHTAbstractNodeLookupTask.cc | |
| parent | 55258bc0192c814654af0288425b7efb009cf6cc (diff) | |
2010-06-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made DHTNodeLookupEntry struct
* src/DHTAbstractNodeLookupTask.cc
* src/DHTIDCloser.h
* src/DHTNodeLookupEntry.cc
* src/DHTNodeLookupEntry.h
* src/DHTPeerLookupTask.cc
* test/DHTIDCloserTest.cc
Diffstat (limited to 'src/DHTAbstractNodeLookupTask.cc')
| -rw-r--r-- | src/DHTAbstractNodeLookupTask.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/DHTAbstractNodeLookupTask.cc b/src/DHTAbstractNodeLookupTask.cc index 5edb1719..dd3bf302 100644 --- a/src/DHTAbstractNodeLookupTask.cc +++ b/src/DHTAbstractNodeLookupTask.cc @@ -71,15 +71,15 @@ void DHTAbstractNodeLookupTask::onReceived size_t count = 0; for(std::vector<SharedHandle<DHTNodeLookupEntry> >::const_iterator i = newEntries.begin(), eoi = newEntries.end(); i != eoi; ++i) { - if(memcmp(getLocalNode()->getID(), (*i)->_node->getID(), + if(memcmp(getLocalNode()->getID(), (*i)->node->getID(), DHT_ID_LENGTH) != 0) { _entries.push_front(*i); ++count; if(getLogger()->debug()) { getLogger()->debug("Received nodes: id=%s, ip=%s", - util::toHex((*i)->_node->getID(), + util::toHex((*i)->node->getID(), DHT_ID_LENGTH).c_str(), - (*i)->_node->getIPAddress().c_str()); + (*i)->node->getIPAddress().c_str()); } } } @@ -106,7 +106,7 @@ void DHTAbstractNodeLookupTask::onTimeout(const SharedHandle<DHTNode>& node) --_inFlightMessage; for(std::deque<SharedHandle<DHTNodeLookupEntry> >::iterator i = _entries.begin(), eoi = _entries.end(); i != eoi; ++i) { - if((*i)->_node == node) { + if((*i)->node == node) { _entries.erase(i); break; } @@ -141,10 +141,10 @@ void DHTAbstractNodeLookupTask::sendMessage() for(std::deque<SharedHandle<DHTNodeLookupEntry> >::iterator i = _entries.begin(), eoi = _entries.end(); i != eoi && _inFlightMessage < ALPHA; ++i) { - if((*i)->_used == false) { + if((*i)->used == false) { ++_inFlightMessage; - (*i)->_used = true; - SharedHandle<DHTMessage> m = createMessage((*i)->_node); + (*i)->used = true; + SharedHandle<DHTMessage> m = createMessage((*i)->node); WeakHandle<DHTMessageCallbackListener> listener(this); SharedHandle<DHTMessageCallback> callback (new DHTMessageCallbackImpl(listener)); |