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

2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Changed method signature:
	DHTAbstractNodeLookupTask::toEntries
	* src/DHTAbstractNodeLookupTask.cc
	* src/DHTAbstractNodeLookupTask.h
pull/1/head
Tatsuhiro Tsujikawa 2008-05-12 12:26:45 +00:00
parent 41b6003cbd
commit c1ba19efe2
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Changed method signature:
DHTAbstractNodeLookupTask::toEntries
* src/DHTAbstractNodeLookupTask.cc
* src/DHTAbstractNodeLookupTask.h
2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Changed method signature: Changed method signature:

13
src/DHTAbstractNodeLookupTask.cc
View File

@ -62,7 +62,8 @@ void DHTAbstractNodeLookupTask::onReceived(const SharedHandle<DHTMessage>& messa
onReceivedInternal(message); onReceivedInternal(message);
std::deque<SharedHandle<DHTNode> > nodes; std::deque<SharedHandle<DHTNode> > nodes;
getNodesFromMessage(nodes, message); getNodesFromMessage(nodes, message);
std::deque<SharedHandle<DHTNodeLookupEntry> > newEntries = toEntries(nodes); std::deque<SharedHandle<DHTNodeLookupEntry> > newEntries;
toEntries(newEntries, nodes);
size_t count = 0; size_t count = 0;
for(std::deque<SharedHandle<DHTNodeLookupEntry> >::const_iterator i = newEntries.begin(); for(std::deque<SharedHandle<DHTNodeLookupEntry> >::const_iterator i = newEntries.begin();
@ -138,7 +139,8 @@ void DHTAbstractNodeLookupTask::startup()
{ {
std::deque<SharedHandle<DHTNode> > nodes; std::deque<SharedHandle<DHTNode> > nodes;
_routingTable->getClosestKNodes(nodes, _targetID); _routingTable->getClosestKNodes(nodes, _targetID);
_entries = toEntries(nodes); _entries.clear();
toEntries(_entries, nodes);
if(_entries.empty()) { if(_entries.empty()) {
_finished = true; _finished = true;
} else { } else {
@ -152,15 +154,14 @@ void DHTAbstractNodeLookupTask::startup()
} }
} }
std::deque<SharedHandle<DHTNodeLookupEntry> > void DHTAbstractNodeLookupTask::toEntries
DHTAbstractNodeLookupTask::toEntries(const std::deque<SharedHandle<DHTNode> >& nodes) const (std::deque<SharedHandle<DHTNodeLookupEntry> >& entries,
const std::deque<SharedHandle<DHTNode> >& nodes) const
{ {
std::deque<SharedHandle<DHTNodeLookupEntry> > entries;
for(std::deque<SharedHandle<DHTNode> >::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { for(std::deque<SharedHandle<DHTNode> >::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
SharedHandle<DHTNodeLookupEntry> e(new DHTNodeLookupEntry(*i)); SharedHandle<DHTNodeLookupEntry> e(new DHTNodeLookupEntry(*i));
entries.push_back(e); entries.push_back(e);
} }
return entries;
} }
} // namespace aria2 } // namespace aria2

6
src/DHTAbstractNodeLookupTask.h
View File

@ -53,9 +53,9 @@ protected:
std::deque<SharedHandle<DHTNodeLookupEntry> > _entries; std::deque<SharedHandle<DHTNodeLookupEntry> > _entries;
size_t _inFlightMessage; size_t _inFlightMessage;
std::deque<SharedHandle<DHTNodeLookupEntry> > void toEntries(std::deque<SharedHandle<DHTNodeLookupEntry> >& entries,
toEntries(const std::deque<SharedHandle<DHTNode> >& nodes) const; const std::deque<SharedHandle<DHTNode> >& nodes) const;
void sendMessage(); void sendMessage();