From f7001132bca9edafc15eda43457144773bada37d Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 12 Jun 2010 02:27:14 +0000 Subject: 2010-06-12 Tatsuhiro Tsujikawa Made protected member variable private. Added accessor funcs. * src/DHTAbstractMessage.cc * src/DHTAbstractMessage.h * src/DHTAnnouncePeerMessage.cc * src/DHTAnnouncePeerMessage.h * src/DHTAnnouncePeerReplyMessage.cc * src/DHTAnnouncePeerReplyMessage.h * src/DHTFindNodeMessage.cc * src/DHTFindNodeMessage.h * src/DHTFindNodeReplyMessage.cc * src/DHTFindNodeReplyMessage.h * src/DHTGetPeersMessage.cc * src/DHTGetPeersMessage.h * src/DHTGetPeersReplyMessage.cc * src/DHTGetPeersReplyMessage.h * src/DHTMessage.h * src/DHTPingMessage.cc * src/DHTPingMessage.h * src/DHTPingReplyMessage.cc * src/DHTPingReplyMessage.h * src/DHTQueryMessage.cc * src/DHTQueryMessage.h * src/DHTResponseMessage.cc * src/DHTResponseMessage.h * src/DHTUnknownMessage.cc * src/DHTUnknownMessage.h * test/MockDHTMessage.h --- src/DHTFindNodeReplyMessage.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/DHTFindNodeReplyMessage.cc') diff --git a/src/DHTFindNodeReplyMessage.cc b/src/DHTFindNodeReplyMessage.cc index 387024f7..e25e9a74 100644 --- a/src/DHTFindNodeReplyMessage.cc +++ b/src/DHTFindNodeReplyMessage.cc @@ -52,9 +52,10 @@ const std::string DHTFindNodeReplyMessage::FIND_NODE("find_node"); const std::string DHTFindNodeReplyMessage::NODES("nodes"); -DHTFindNodeReplyMessage::DHTFindNodeReplyMessage(const SharedHandle& localNode, - const SharedHandle& remoteNode, - const std::string& transactionID): +DHTFindNodeReplyMessage::DHTFindNodeReplyMessage +(const SharedHandle& localNode, + const SharedHandle& remoteNode, + const std::string& transactionID): DHTResponseMessage(localNode, remoteNode, transactionID) {} DHTFindNodeReplyMessage::~DHTFindNodeReplyMessage() {} @@ -63,8 +64,8 @@ void DHTFindNodeReplyMessage::doReceivedAction() { for(std::vector >::iterator i = _closestKNodes.begin(), eoi = _closestKNodes.end(); i != eoi; ++i) { - if(memcmp((*i)->getID(), _localNode->getID(), DHT_ID_LENGTH) != 0) { - _routingTable->addNode(*i); + if(memcmp((*i)->getID(), getLocalNode()->getID(), DHT_ID_LENGTH) != 0) { + getRoutingTable()->addNode(*i); } } } @@ -72,7 +73,7 @@ void DHTFindNodeReplyMessage::doReceivedAction() BDE DHTFindNodeReplyMessage::getResponse() { BDE aDict = BDE::dict(); - aDict[DHTMessage::ID] = BDE(_localNode->getID(), DHT_ID_LENGTH); + aDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH); size_t offset = 0; unsigned char buffer[DHTBucket::K*26]; // TODO if _closestKNodes.size() > DHTBucket::K ?? @@ -90,13 +91,11 @@ BDE DHTFindNodeReplyMessage::getResponse() return aDict; } -std::string DHTFindNodeReplyMessage::getMessageType() const +const std::string& DHTFindNodeReplyMessage::getMessageType() const { return FIND_NODE; } -void DHTFindNodeReplyMessage::validate() const {} - void DHTFindNodeReplyMessage::setClosestKNodes (const std::vector >& closestKNodes) { -- cgit