From 07d270c87e6f9184aea4ca17eb26e466712e8db2 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 22 Jun 2013 01:10:38 +0900 Subject: Require -std=c++11 and use std::shared_ptr instead of SharedHandle --- src/DHTMessageFactoryImpl.cc | 98 ++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'src/DHTMessageFactoryImpl.cc') diff --git a/src/DHTMessageFactoryImpl.cc b/src/DHTMessageFactoryImpl.cc index 4e09db3b..f1d07c2b 100644 --- a/src/DHTMessageFactoryImpl.cc +++ b/src/DHTMessageFactoryImpl.cc @@ -75,11 +75,11 @@ DHTMessageFactoryImpl::DHTMessageFactoryImpl(int family) DHTMessageFactoryImpl::~DHTMessageFactoryImpl() {} -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::getRemoteNode (const unsigned char* id, const std::string& ipaddr, uint16_t port) const { - SharedHandle node = routingTable_->getNode(id, ipaddr, port); + std::shared_ptr node = routingTable_->getNode(id, ipaddr, port); if(!node) { node.reset(new DHTNode(id)); node->setIPAddress(ipaddr); @@ -188,7 +188,7 @@ void DHTMessageFactoryImpl::validatePort(const Integer* port) const } namespace { -void setVersion(const SharedHandle& msg, const Dict* dict) +void setVersion(const std::shared_ptr& msg, const Dict* dict) { const String* v = downcast(dict->get(DHTMessage::V)); if(v) { @@ -199,7 +199,7 @@ void setVersion(const SharedHandle& msg, const Dict* dict) } } // namespace -SharedHandle DHTMessageFactoryImpl::createQueryMessage +std::shared_ptr DHTMessageFactoryImpl::createQueryMessage (const Dict* dict, const std::string& ipaddr, uint16_t port) { const String* messageType = getString(dict, DHTQueryMessage::Q); @@ -211,8 +211,8 @@ SharedHandle DHTMessageFactoryImpl::createQueryMessage } const String* id = getString(aDict, DHTMessage::ID); validateID(id); - SharedHandle remoteNode = getRemoteNode(id->uc(), ipaddr, port); - SharedHandle msg; + std::shared_ptr remoteNode = getRemoteNode(id->uc(), ipaddr, port); + std::shared_ptr msg; if(messageType->s() == DHTPingMessage::PING) { msg = createPingMessage(remoteNode, transactionID->s()); } else if(messageType->s() == DHTFindNodeMessage::FIND_NODE) { @@ -242,7 +242,7 @@ SharedHandle DHTMessageFactoryImpl::createQueryMessage return msg; } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createResponseMessage (const std::string& messageType, const Dict* dict, @@ -270,8 +270,8 @@ DHTMessageFactoryImpl::createResponseMessage const Dict* rDict = getDictionary(dict, DHTResponseMessage::R); const String* id = getString(rDict, DHTMessage::ID); validateID(id); - SharedHandle remoteNode = getRemoteNode(id->uc(), ipaddr, port); - SharedHandle msg; + std::shared_ptr remoteNode = getRemoteNode(id->uc(), ipaddr, port); + std::shared_ptr msg; if(messageType == DHTPingReplyMessage::PING) { msg = createPingReplyMessage(remoteNode, id->uc(), transactionID->s()); } else if(messageType == DHTFindNodeReplyMessage::FIND_NODE) { @@ -312,51 +312,51 @@ void DHTMessageFactoryImpl::setCommonProperty(DHTAbstractMessage* m) m->setVersion(getDefaultVersion()); } -SharedHandle DHTMessageFactoryImpl::createPingMessage -(const SharedHandle& remoteNode, const std::string& transactionID) +std::shared_ptr DHTMessageFactoryImpl::createPingMessage +(const std::shared_ptr& remoteNode, const std::string& transactionID) { DHTPingMessage* m(new DHTPingMessage(localNode_, remoteNode, transactionID)); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle DHTMessageFactoryImpl::createPingReplyMessage -(const SharedHandle& remoteNode, +std::shared_ptr DHTMessageFactoryImpl::createPingReplyMessage +(const std::shared_ptr& remoteNode, const unsigned char* id, const std::string& transactionID) { DHTPingReplyMessage* m (new DHTPingReplyMessage(localNode_, remoteNode, id, transactionID)); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle DHTMessageFactoryImpl::createFindNodeMessage -(const SharedHandle& remoteNode, +std::shared_ptr DHTMessageFactoryImpl::createFindNodeMessage +(const std::shared_ptr& remoteNode, const unsigned char* targetNodeID, const std::string& transactionID) { DHTFindNodeMessage* m(new DHTFindNodeMessage (localNode_, remoteNode, targetNodeID, transactionID)); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createFindNodeReplyMessage -(const SharedHandle& remoteNode, - const std::vector >& closestKNodes, +(const std::shared_ptr& remoteNode, + const std::vector >& closestKNodes, const std::string& transactionID) { DHTFindNodeReplyMessage* m(new DHTFindNodeReplyMessage (family_, localNode_, remoteNode, transactionID)); m->setClosestKNodes(closestKNodes); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } void DHTMessageFactoryImpl::extractNodes -(std::vector >& nodes, +(std::vector >& nodes, const unsigned char* src, size_t length) { int unit = bittorrent::getCompactLength(family_)+20; @@ -365,7 +365,7 @@ void DHTMessageFactoryImpl::extractNodes (fmt("Nodes length is not multiple of %d", unit)); } for(size_t offset = 0; offset < length; offset += unit) { - SharedHandle node(new DHTNode(src+offset)); + std::shared_ptr node(new DHTNode(src+offset)); std::pair addr = bittorrent::unpackcompact(src+offset+DHT_ID_LENGTH, family_); if(addr.first.empty()) { @@ -377,9 +377,9 @@ void DHTMessageFactoryImpl::extractNodes } } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createFindNodeReplyMessage -(const SharedHandle& remoteNode, +(const std::shared_ptr& remoteNode, const Dict* dict, const std::string& transactionID) { @@ -387,16 +387,16 @@ DHTMessageFactoryImpl::createFindNodeReplyMessage downcast(getDictionary(dict, DHTResponseMessage::R)-> get(family_ == AF_INET?DHTFindNodeReplyMessage::NODES: DHTFindNodeReplyMessage::NODES6)); - std::vector > nodes; + std::vector > nodes; if(nodesData) { extractNodes(nodes, nodesData->uc(), nodesData->s().size()); } return createFindNodeReplyMessage(remoteNode, nodes, transactionID); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createGetPeersMessage -(const SharedHandle& remoteNode, +(const std::shared_ptr& remoteNode, const unsigned char* infoHash, const std::string& transactionID) { @@ -405,12 +405,12 @@ DHTMessageFactoryImpl::createGetPeersMessage m->setPeerAnnounceStorage(peerAnnounceStorage_); m->setTokenTracker(tokenTracker_); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createGetPeersReplyMessage -(const SharedHandle& remoteNode, +(const std::shared_ptr& remoteNode, const Dict* dict, const std::string& transactionID) { @@ -418,13 +418,13 @@ DHTMessageFactoryImpl::createGetPeersReplyMessage const String* nodesData = downcast(rDict->get(family_ == AF_INET?DHTGetPeersReplyMessage::NODES: DHTGetPeersReplyMessage::NODES6)); - std::vector > nodes; + std::vector > nodes; if(nodesData) { extractNodes(nodes, nodesData->uc(), nodesData->s().size()); } const List* valuesList = downcast(rDict->get(DHTGetPeersReplyMessage::VALUES)); - std::vector > peers; + std::vector > peers; size_t clen = bittorrent::getCompactLength(family_); if(valuesList) { for(List::ValueType::const_iterator i = valuesList->begin(), @@ -436,7 +436,7 @@ DHTMessageFactoryImpl::createGetPeersReplyMessage if(addr.first.empty()) { continue; } - SharedHandle peer(new Peer(addr.first, addr.second)); + std::shared_ptr peer(new Peer(addr.first, addr.second)); peers.push_back(peer); } } @@ -446,11 +446,11 @@ DHTMessageFactoryImpl::createGetPeersReplyMessage (remoteNode, nodes, peers, token->s(), transactionID); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createGetPeersReplyMessage -(const SharedHandle& remoteNode, - const std::vector >& closestKNodes, - const std::vector >& values, +(const std::shared_ptr& remoteNode, + const std::vector >& closestKNodes, + const std::vector >& values, const std::string& token, const std::string& transactionID) { @@ -460,12 +460,12 @@ DHTMessageFactoryImpl::createGetPeersReplyMessage m->setClosestKNodes(closestKNodes); m->setValues(values); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createAnnouncePeerMessage -(const SharedHandle& remoteNode, +(const std::shared_ptr& remoteNode, const unsigned char* infoHash, uint16_t tcpPort, const std::string& token, @@ -477,20 +477,20 @@ DHTMessageFactoryImpl::createAnnouncePeerMessage m->setPeerAnnounceStorage(peerAnnounceStorage_); m->setTokenTracker(tokenTracker_); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createAnnouncePeerReplyMessage -(const SharedHandle& remoteNode, const std::string& transactionID) +(const std::shared_ptr& remoteNode, const std::string& transactionID) { DHTAnnouncePeerReplyMessage* m (new DHTAnnouncePeerReplyMessage(localNode_, remoteNode, transactionID)); setCommonProperty(m); - return SharedHandle(m); + return std::shared_ptr(m); } -SharedHandle +std::shared_ptr DHTMessageFactoryImpl::createUnknownMessage (const unsigned char* data, size_t length, const std::string& ipaddr, uint16_t port) @@ -498,7 +498,7 @@ DHTMessageFactoryImpl::createUnknownMessage { DHTUnknownMessage* m (new DHTUnknownMessage(localNode_, data, length, ipaddr, port)); - return SharedHandle(m); + return std::shared_ptr(m); } void DHTMessageFactoryImpl::setRoutingTable(DHTRoutingTable* routingTable) @@ -529,7 +529,7 @@ void DHTMessageFactoryImpl::setTokenTracker(DHTTokenTracker* tokenTracker) } void DHTMessageFactoryImpl::setLocalNode -(const SharedHandle& localNode) +(const std::shared_ptr& localNode) { localNode_ = localNode; } -- cgit